<!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>[120408] trunk/dports/science/ccpnmr</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/120408">120408</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-05-27 13:00:18 -0700 (Tue, 27 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>ccpnmr: maintainer update to 2.4.0 (#43823)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsscienceccpnmrPortfile">trunk/dports/science/ccpnmr/Portfile</a></li>
<li><a href="#trunkdportsscienceccpnmrfilesccpnmrpatch">trunk/dports/science/ccpnmr/files/ccpnmr.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsscienceccpnmrPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/ccpnmr/Portfile (120407 => 120408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/ccpnmr/Portfile 2014-05-27 19:53:32 UTC (rev 120407)
+++ trunk/dports/science/ccpnmr/Portfile 2014-05-27 20:00:18 UTC (rev 120408)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name ccpnmr
</span><del>-version 2.3.1r2
</del><ins>+version 2.4.0
</ins><span class="cx"> set branch [join [lrange [split $version .] 0 1] .]
</span><span class="cx"> categories science python
</span><span class="cx"> maintainers bromo.med.uc.edu:howarth
</span><span class="lines">@@ -19,8 +19,8 @@
</span><span class="cx"> homepage http://www.ccpn.ac.uk/ccpn/software/ccpnmr-suite
</span><span class="cx"> master_sites http://www2.ccpn.ac.uk/download/ccpnmr/
</span><span class="cx"> distname analysis${version}
</span><del>-checksums rmd160 f695780f5bce5f0c1e84080b8364b5bfaba2a0e9 \
- sha256 a9e47a24d84f7b8261c6c23a8607af5a6ba2f2db9e161a7f873794c1ba8663ef
</del><ins>+checksums rmd160 9baea0f12b83cd7a8bb6b339256fd7b51e5b4dbd \
+ sha256 efde9f398bb62cb79e32cfe3118fe2af4ff6c56e5a9068bee654b3aa00f20ae1
</ins><span class="cx"> worksrcdir ${name}
</span><span class="cx"> depends_lib port:py27-scipy port:mesa port:freeglut port:tk port:py27-tkinter
</span><span class="cx"> patchfiles ccpnmr.patch
</span></span></pre></div>
<a id="trunkdportsscienceccpnmrfilesccpnmrpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/ccpnmr/files/ccpnmr.patch (120407 => 120408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/ccpnmr/files/ccpnmr.patch 2014-05-27 19:53:32 UTC (rev 120407)
+++ trunk/dports/science/ccpnmr/files/ccpnmr.patch 2014-05-27 20:00:18 UTC (rev 120408)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> + export LIBGL_ALWAYS_INDIRECT=1
</span><span class="cx"> +fi
</span><span class="cx"> +
</span><del>-+@PYTHON_BIN@ -i -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.3/python/ccpnmr/analysis/AnalysisGui.py $1 $2 $3 $4 $5
</del><ins>++@PYTHON_BIN@ -i -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.4/python/ccpnmr/analysis/AnalysisGui.py $1 $2 $3 $4 $5
</ins><span class="cx"> --- bin/formatConverter.orig 1970-01-01 01:00:00.000000000 +0100
</span><span class="cx"> +++ bin/formatConverter 2005-12-23 20:44:06.000000000 +0000
</span><span class="cx"> @@ -0,0 +1,9 @@
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> + export LIBGL_ALWAYS_INDIRECT=1
</span><span class="cx"> +fi
</span><span class="cx"> +
</span><del>-+@PYTHON_BIN@ -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.3/python/ccpnmr/format/gui/FormatConverter.py $1 $2
</del><ins>++@PYTHON_BIN@ -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.4/python/ccpnmr/format/gui/FormatConverter.py $1 $2
</ins><span class="cx"> --- bin/pipe2azara.orig 1970-01-01 01:00:00.000000000 +0100
</span><span class="cx"> +++ bin/pipe2azara 2005-12-23 20:44:06.000000000 +0000
</span><span class="cx"> @@ -0,0 +1,9 @@
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> + export LIBGL_ALWAYS_INDIRECT=1
</span><span class="cx"> +fi
</span><span class="cx"> +
</span><del>-+@PYTHON_BIN@ -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.3/python/ccpnmr/analysis/NmrPipeData.py $1 $2 $3
</del><ins>++@PYTHON_BIN@ -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.4/python/ccpnmr/analysis/NmrPipeData.py $1 $2 $3
</ins><span class="cx"> --- bin/dataShifter.orig 1970-01-01 01:00:00.000000000 +0100
</span><span class="cx"> +++ bin/dataShifter 2008-03-24 19:03:07.000000000 +0000
</span><span class="cx"> @@ -0,0 +1,9 @@
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> + export LIBGL_ALWAYS_INDIRECT=1
</span><span class="cx"> +fi
</span><span class="cx"> +
</span><del>-+@PYTHON_BIN@ -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.3/python/ccpnmr/format/gui/DataShifter.py
</del><ins>++@PYTHON_BIN@ -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.4/python/ccpnmr/format/gui/DataShifter.py
</ins><span class="cx"> --- bin/updateAll.orig 1970-01-01 01:00:00.000000000 +0100
</span><span class="cx"> +++ bin/updateAll 2008-03-24 19:04:31.000000000 +0000
</span><span class="cx"> @@ -0,0 +1,9 @@
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> + export LIBGL_ALWAYS_INDIRECT=1
</span><span class="cx"> +fi
</span><span class="cx"> +
</span><del>-+@PYTHON_BIN@ -i -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.3/python/ccpnmr/update/UpdateAuto.py
</del><ins>++@PYTHON_BIN@ -i -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.4/python/ccpnmr/update/UpdateAuto.py
</ins><span class="cx"> --- bin/updateCheck.orig 1970-01-01 01:00:00.000000000 +0100
</span><span class="cx"> +++ bin/updateCheck 2008-03-24 19:06:16.000000000 +0000
</span><span class="cx"> @@ -0,0 +1,9 @@
</span><span class="lines">@@ -69,9 +69,9 @@
</span><span class="cx"> + export LIBGL_ALWAYS_INDIRECT=1
</span><span class="cx"> +fi
</span><span class="cx"> +
</span><del>-+@PYTHON_BIN@ -i -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.3/python/ccpnmr/update/UpdatePopup.py
---- ccpnmr2.3/c/ccp/structure/Makefile.orig 2012-03-13 12:30:17.000000000 -0400
-+++ ccpnmr2.3/c/ccp/structure/Makefile 2012-04-08 17:19:22.000000000 -0400
</del><ins>++@PYTHON_BIN@ -i -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.4/python/ccpnmr/update/UpdatePopup.py
+--- ccpnmr2.4/c/ccp/structure/Makefile.orig 2012-03-13 12:30:17.000000000 -0400
++++ ccpnmr2.4/c/ccp/structure/Makefile 2012-04-08 17:19:22.000000000 -0400
</ins><span class="cx"> @@ -40,11 +40,11 @@
</span><span class="cx"> $(GLOBAL_DIR)/py_tk_handler.$(OBJ_SUFFIX) \
</span><span class="cx"> $(GLOBAL_DIR)/py_tk_util.$(OBJ_SUFFIX)
</span><span class="lines">@@ -88,8 +88,8 @@
</span><span class="cx">
</span><span class="cx"> ALL_LIB = $(GL_LIB) $(TK_LIB) $(X11_LIB) $(MATH_LIB)
</span><span class="cx">
</span><del>---- ccpnmr2.3/c/ccpnmr/analysis/Makefile.orig 2012-03-13 12:30:17.000000000 -0400
-+++ ccpnmr2.3/c/ccpnmr/analysis/Makefile 2012-04-08 17:18:17.000000000 -0400
</del><ins>+--- ccpnmr2.4/c/ccpnmr/analysis/Makefile.orig 2012-03-13 12:30:17.000000000 -0400
++++ ccpnmr2.4/c/ccpnmr/analysis/Makefile 2012-04-08 17:18:17.000000000 -0400
</ins><span class="cx"> @@ -55,11 +55,11 @@
</span><span class="cx"> $(GLOBAL_DIR)/py_tk_handler.$(OBJ_SUFFIX) \
</span><span class="cx"> $(GLOBAL_DIR)/py_tk_util.$(OBJ_SUFFIX)
</span><span class="lines">@@ -106,8 +106,8 @@
</span><span class="cx">
</span><span class="cx"> ALL_LIB = $(GL_LIB) $(TK_LIB) $(X11_LIB) $(MATH_LIB)
</span><span class="cx">
</span><del>---- ccpnmr2.3/c/memops/global/Makefile.orig 2012-03-13 12:30:17.000000000 -0400
-+++ ccpnmr2.3/c/memops/global/Makefile 2012-04-08 17:11:36.000000000 -0400
</del><ins>+--- ccpnmr2.4/c/memops/global/Makefile.orig 2012-03-13 12:30:17.000000000 -0400
++++ ccpnmr2.4/c/memops/global/Makefile 2012-04-08 17:11:36.000000000 -0400
</ins><span class="cx"> @@ -137,10 +137,10 @@
</span><span class="cx">
</span><span class="cx"> TCLTK_LIB = $(TK_LIB) $(X11_LIB) $(MATH_LIB)
</span><span class="lines">@@ -122,8 +122,8 @@
</span><span class="cx">
</span><span class="cx"> ALL_LIB = $(GL_LIB) $(TK_LIB) $(X11_LIB) $(MATH_LIB)
</span><span class="cx">
</span><del>---- ccpnmr2.3/c/environment-opengl.txt.orig 2012-04-08 17:31:08.000000000 -0400
-+++ ccpnmr2.3/c/environment-opengl.txt 2012-04-08 17:33:55.000000000 -0400
</del><ins>+--- ccpnmr2.4/c/environment-opengl.txt.orig 2012-04-08 17:31:08.000000000 -0400
++++ ccpnmr2.4/c/environment-opengl.txt 2012-04-08 17:33:55.000000000 -0400
</ins><span class="cx"> @@ -0,0 +1,56 @@
</span><span class="cx"> +#Environment file for use with fink to build ccpnmr suite - environment.txt
</span><span class="cx"> +
</span></span></pre>
</div>
</div>
</body>
</html>