<!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>[117365] trunk/dports/python</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/117365">117365</a></dd>
<dt>Author</dt> <dd>rowue@macports.org</dd>
<dt>Date</dt> <dd>2014-02-24 06:23:00 -0800 (Mon, 24 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>py26-pyphant: moved to portgroup python</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpypyphantPortfile">trunk/dports/python/py-pyphant/Portfile</a></li>
<li><a href="#trunkdportspythonpypyphantfilespyphant">trunk/dports/python/py-pyphant/files/pyphant</a></li>
<li><a href="#trunkdportspythonpypyphantfilespyphantquartz">trunk/dports/python/py-pyphant/files/pyphant.quartz</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/python/py-pyphant/</li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/dports/python/py26-pyphant/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonpypyphantPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-pyphant/Portfile (117361 => 117365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py26-pyphant/Portfile 2014-02-24 04:57:48 UTC (rev 117361)
+++ trunk/dports/python/py-pyphant/Portfile 2014-02-24 14:23:00 UTC (rev 117365)
</span><span class="lines">@@ -2,11 +2,10 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><del>-PortGroup python26 1.0
</del><ins>+PortGroup python 1.0
</ins><span class="cx"> PortGroup wxWidgets 1.0
</span><del>-PortGroup app 1.0
</del><span class="cx">
</span><del>-name py26-pyphant
</del><ins>+name py-pyphant
</ins><span class="cx"> version 1.0b2
</span><span class="cx"> revision 1
</span><span class="cx"> categories-append science
</span><span class="lines">@@ -25,7 +24,7 @@
</span><span class="cx"> To implement actual processing steps, Pyphant relies on \
</span><span class="cx"> third party plug-ins, also referred to as toolboxes, \
</span><span class="cx"> which extend the basic worker class, e.g. \
</span><del>- py26-pyphant-imageprocessing. \
</del><ins>+ py-pyphant-imageprocessing. \
</ins><span class="cx"> On top of the core, Pyphant offers a data exchange layer \
</span><span class="cx"> on basis of numpy arrays which facilitates the \
</span><span class="cx"> interoperability of the workers and fully supports \
</span><span class="lines">@@ -39,31 +38,9 @@
</span><span class="cx"> license BSD
</span><span class="cx">
</span><span class="cx"> platforms darwin
</span><del>-depends_lib port:py26-scipy \
- port:py26-setuptools \
- port:py26-tables \
- port:py26-antlr3 \
- port:py26-matplotlib \
- port:py26-scientific \
- port:py26-wxpython-2.8 \
- port:py26-simplejson \
- port:py26-paste \
- port:py26-mx-base \
- port:py26-tornado \
- port:py26-configobj \
- port:py26-pyphant-fmf \
- port:py26-pyphant-imageprocessing \
- port:py26-pyphant-osc \
- port:py26-pyphant-statistics \
- port:py26-pyphant-tools \
- port:py26-sogl
</del><span class="cx">
</span><span class="cx"> # py26-scipy is not universal
</span><span class="cx"> universal_variant no
</span><del>-app.name pyphant
-# app.executable wxPyphant-2.6
-app.executable pyphant
-app.icon ${filespath}/Pyphant.icns
</del><span class="cx">
</span><span class="cx"> master_sites sourceforge:pyphant
</span><span class="cx"> # master_sites http://pyphant.sourceforge.net/nightly-builds/
</span><span class="lines">@@ -76,17 +53,49 @@
</span><span class="cx">
</span><span class="cx"> use_configure no
</span><span class="cx">
</span><ins>+python.versions 26
+
</ins><span class="cx"> variant carbon description { Install pyphant with carbon support } {
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-pre-destroot {
- if {[variant_isset carbon]} {
- file copy ${filespath}/pyphant.quartz ${destroot}${prefix}/bin
- file rename ${destroot}${prefix}/bin/pyphant.quartz ${destroot}${prefix}/bin/pyphant
- } else {
- file copy ${filespath}/pyphant ${destroot}${prefix}/bin
- reinplace "s|@APPDIR@|${applications_dir}|" ${destroot}${prefix}/bin/pyphant
</del><ins>+if {${name} ne ${subport}} {
+ PortGroup app 1.0
+ app.name pyphant-${python.branch}
+ # app.executable wxPyphant-2.6
+ app.executable pyphant-${python.branch}
+ app.icon ${filespath}/Pyphant.icns
+
+ depends_build port:py${python.version}-setuptools
+ depends_lib port:py${python.version}-scipy \
+ port:py${python.version}-setuptools \
+ port:py${python.version}-tables \
+ port:py${python.version}-antlr3 \
+ port:py${python.version}-matplotlib \
+ port:py${python.version}-scientific \
+ port:py${python.version}-wxpython-2.8 \
+ port:py${python.version}-simplejson \
+ port:py${python.version}-paste \
+ port:py${python.version}-mx-base \
+ port:py${python.version}-tornado \
+ port:py${python.version}-configobj \
+ port:py${python.version}-pyphant-fmf \
+ port:py${python.version}-pyphant-imageprocessing \
+ port:py${python.version}-pyphant-osc \
+ port:py${python.version}-pyphant-statistics \
+ port:py${python.version}-pyphant-tools \
+ port:py${python.version}-sogl
+
+ pre-destroot {
+ if {[variant_isset carbon]} {
+ file copy ${filespath}/pyphant.quartz ${destroot}${prefix}/bin
+ file rename ${destroot}${prefix}/bin/pyphant.quartz ${destroot}${prefix}/bin/pyphant-${python.branch}
+ } else {
+ file copy ${filespath}/pyphant ${destroot}${prefix}/bin
+ file rename ${destroot}${prefix}/bin/pyphant ${destroot}${prefix}/bin/pyphant-${python.branch}
+ reinplace "s|@APPDIR@|${applications_dir}|" ${destroot}${prefix}/bin/pyphant-${python.branch}
+ }
+ reinplace "s|@PREFIX@|${prefix}|" ${destroot}${prefix}/bin/pyphant-${python.branch}
+ reinplace "s|@PYTHONBRANCH@|${python.branch}|" ${destroot}${prefix}/bin/pyphant-${python.branch}
</ins><span class="cx"> }
</span><del>- reinplace "s|@PREFIX@|${prefix}|" ${destroot}${prefix}/bin/pyphant
</del><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportspythonpypyphantfilespyphant"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-pyphant/files/pyphant (117361 => 117365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py26-pyphant/files/pyphant 2014-02-24 04:57:48 UTC (rev 117361)
+++ trunk/dports/python/py-pyphant/files/pyphant 2014-02-24 14:23:00 UTC (rev 117365)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><span class="cx"> #!/bin/bash
</span><span class="cx"> if [ -x @APPDIR@/X11.app/Contents/MacOS/X11 ]; then
</span><del>- open -a @APPDIR@/X11.app/Contents/MacOS/X11 @PREFIX@/bin/wxPyphant-2.6
</del><ins>+ open -a @APPDIR@/X11.app/Contents/MacOS/X11 @PREFIX@/bin/wxPyphant-@PYTHONBRANCH@
</ins><span class="cx"> elif [ -x /Applications/Utilities/XQuartz.app/Contents/MacOS/X11 ]; then
</span><del>- open -a /Applications/Utilities/XQuartz.app/Contents/MacOS/X11 @PREFIX@/bin/wxPyphant-2.6
</del><ins>+ open -a /Applications/Utilities/XQuartz.app/Contents/MacOS/X11 @PREFIX@/bin/wxPyphant-@PYTHONBRANCH@
</ins><span class="cx"> else
</span><del>- open -a /Applications/Utilities/X11.app/Contents/MacOS/X11 @PREFIX@/bin/wxPyphant-2.6
</del><ins>+ open -a /Applications/Utilities/X11.app/Contents/MacOS/X11 @PREFIX@/bin/wxPyphant-@PYTHONBRANCH@
</ins><span class="cx"> fi
</span></span></pre></div>
<a id="trunkdportspythonpypyphantfilespyphantquartz"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-pyphant/files/pyphant.quartz (117361 => 117365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py26-pyphant/files/pyphant.quartz 2014-02-24 04:57:48 UTC (rev 117361)
+++ trunk/dports/python/py-pyphant/files/pyphant.quartz 2014-02-24 14:23:00 UTC (rev 117365)
</span><span class="lines">@@ -2,4 +2,4 @@
</span><span class="cx"> LOGNAME=`logname`
</span><span class="cx"> export LOGNAME
</span><span class="cx"> cd $HOME
</span><del>-exec @PREFIX@/bin/wxPyphant-2.6
</del><ins>+exec @PREFIX@/bin/wxPyphant-@PYTHONBRANCH@
</ins></span></pre>
</div>
</div>
</body>
</html>