<!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>[122639] 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/122639">122639</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-07-25 08:20:52 -0700 (Fri, 25 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>py-pyphant: merge multiple ports (fmf, imageprocessing, osc, statistics, tools) into subports, deprecate Python 2.6, remove +carbon variant (closes #40347)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpypyphantPortfile">trunk/dports/python/py-pyphant/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/dports/python/py-pyphant-fmf/</li>
<li>trunk/dports/python/py-pyphant-imageprocessing/</li>
<li>trunk/dports/python/py-pyphant-osc/</li>
<li>trunk/dports/python/py-pyphant-statistics/</li>
<li>trunk/dports/python/py-pyphant-tools/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonpypyphantPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-pyphant/Portfile (122638 => 122639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-pyphant/Portfile 2014-07-25 15:06:28 UTC (rev 122638)
+++ trunk/dports/python/py-pyphant/Portfile 2014-07-25 15:20:52 UTC (rev 122639)
</span><span class="lines">@@ -7,6 +7,7 @@
</span><span class="cx">
</span><span class="cx"> name py-pyphant
</span><span class="cx"> version 1.0b3
</span><ins>+revision 1
</ins><span class="cx"> categories-append science
</span><span class="cx"> description python framework for analysing and managing scientific data
</span><span class="cx"> maintainers fmf.uni-freiburg.de:servicegruppe.wissinfo \
</span><span class="lines">@@ -41,56 +42,162 @@
</span><span class="cx"> # py26-scipy is not universal
</span><span class="cx"> universal_variant no
</span><span class="cx">
</span><ins>+distname pyphant
</ins><span class="cx"> master_sites sourceforge:pyphant
</span><del>-# master_sites http://pyphant.sourceforge.net/nightly-builds/
-distname pyphant-${version}
-# use_bzip2 yes
</del><span class="cx">
</span><del>-checksums sha256 c873352467f9ecf96fac03082e3cbc4153d13f8103e5339e608897884867db53 \
- rmd160 aa56f61a73300651730f867b249264e2ca63d200
-
</del><span class="cx"> use_configure no
</span><span class="cx">
</span><del>-python.versions 26 27
</del><ins>+python.versions 27
</ins><span class="cx">
</span><del>-variant carbon description { Install pyphant with carbon support } {
</del><ins>+if {${name} ne ${subport}} {
+ depends_build-append port:py${python.version}-setuptools
</ins><span class="cx">
</span><ins>+ if [string match {py??-pyphant-*} ${subport}] {
+ depends_lib-append port:py${python.version}-pyphant
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-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}-numpy \
- port:py${python.version}-scipy \
- port:py${python.version}-setuptools \
- port:py${python.version}-tables \
- port:py${python.version}-matplotlib \
- port:py${python.version}-simplejson \
- port:py${python.version}-paste \
- port:py${python.version}-mx-base \
- port:py${python.version}-configobj \
- port:py${python.version}-sogl
- if {${python.version} == 26} {
- depends_lib-append port:py26-wxpython-2.8
- } else {
- depends_lib-append port:py${python.version}-wxpython-3.0
</del><ins>+# these two definitions for 'replaced by' ports could probably be combined
+# the definitions could go away after July 2015
+subport py26-${distname} {
+ replaced_by py27-${distname}
+ PortGroup obsolete 1.0
+ depends_build
+ depends_lib
+ depends_run
+}
+foreach n {fmf imageprocessing osc statistics tools} {
+ subport py26-${distname}-${n} {
+ replaced_by py27-${distname}-${n}
+ PortGroup obsolete 1.0
+ depends_build
+ depends_lib
+ depends_run
</ins><span class="cx"> }
</span><ins>+}
</ins><span class="cx">
</span><del>- pre-destroot {
- if {[variant_isset carbon]} {
</del><ins>+foreach python.vers ${python.versions} {
+ subport py${python.vers}-${distname} {
+ PortGroup app 1.0
+ set python.version ${python.vers}
+ worksrcdir ${distname}-${version}
+ distfiles ${distname}-${version}${extract.suffix}
+ checksums rmd160 aa56f61a73300651730f867b249264e2ca63d200 \
+ sha256 c873352467f9ecf96fac03082e3cbc4153d13f8103e5339e608897884867db53
+
+ app.name pyphant-${python.branch}
+ app.executable pyphant-${python.branch}
+ app.icon ${filespath}/Pyphant.icns
+
+ wxWidgets.use wxPython-3.0
+
+ depends_lib-append port:py${python.version}-numpy \
+ port:py${python.version}-scipy \
+ port:py${python.version}-tables \
+ port:py${python.version}-matplotlib \
+ port:py${python.version}-simplejson \
+ port:py${python.version}-paste \
+ port:py${python.version}-mx-base \
+ port:py${python.version}-sogl \
+ port:py${python.version}-wxpython-3.0
+
+ depends_run-append port:py${python.version}-configobj \
+ port:py${python.version}-tornado
+
+ pre-destroot {
</ins><span class="cx"> file copy ${filespath}/pyphant.quartz ${destroot}${prefix}/bin
</span><span class="cx"> file rename ${destroot}${prefix}/bin/pyphant.quartz ${destroot}${prefix}/bin/pyphant-${python.branch}
</span><del>- } 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}
</del><ins>+ 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-${python.branch}
- reinplace "s|@PYTHONBRANCH@|${python.branch}|" ${destroot}${prefix}/bin/pyphant-${python.branch}
</del><span class="cx"> }
</span><ins>+
+ subport py${python.vers}-${distname}-fmf {
+ set python.version ${python.vers}
+ description Full-Metadata Format toolbox for py${python.version}-pyphant
+ long_description This toolbox enables the py${python.version}-pyphant framework to read \
+ files written in the Full-Metadata Format (FMF). \
+ See http://arxiv.org/abs/0904.1299 for an introduction \
+ to the FMF. There is also support for writing files \
+ in the FMF, although this feature is currently not \
+ accessible from the pyphant GUI.
+
+ distname ${distname}.fmf-${version}
+ checksums rmd160 42d70609400f636b2c4ffced5e5f2192f76ac4ad \
+ sha256 8ef7acf200f6a7a8805d4f91680fd771129f1c68178d8d710b7a9a322267cdfc
+ }
+
+ subport py${python.vers}-${distname}-imageprocessing {
+ set python.version ${python.vers}
+ description imageprocessing toolbox for py${python.version}-pyphant
+ long_description This toolbox provides a set of imageprocessing workers, \
+ i.e. encapsulated data processing steps for the \
+ py${python.version}-pyphant framework. Currently there are 22 workers \
+ providing operations varying from simple functions like \
+ 'inversion' or some scipy.ndimage filters to more complex \
+ operations, e.g. auto-focus evaluation of transmitted \
+ light microscopy photographs.
+
+ distname ${distname}.imageprocessing-${version}
+ checksums rmd160 e4d160989c0e5b07528577052dd451b47828a7d4 \
+ sha256 9e1619cf3abbe94ce785b9b5b02383b5a31f9ba2ef0bc75922c785195620229f
+
+ # numpy and scipy are already dependencies of pyphant
+ depends_lib-append port:py${python.version}-pil \
+ port:py${python.version}-numpy \
+ port:py${python.version}-scipy
+ }
+
+ subport py${python.vers}-${distname}-osc {
+ set python.version ${python.vers}
+ description organic solar cells toolbox for py${python.version}-pyphant
+ long_description This Toolbox offers various workers for the \
+ analysis of organic solar cells. It is joined \
+ work with Kristian O. Sylvester-Hvid from the \
+ Risø National Laboratory for Sustainable Energy. \
+ The main purpose at the moment is the generation \
+ of height maps for polymer based solar cells. \
+ The developed workers are however applicable in \
+ a wide range of problems.
+
+ distname ${distname}.osc-${version}
+ checksums rmd160 1093b2a9b036648f76089f5d1b919186b7a2dd2c \
+ sha256 ba573aaa5cb78c4f692798e2c6845f4a0b11b99d721905be56c47db1885d3e67
+
+ depends_lib-append port:py${python.version}-numpy \
+ port:py${python.version}-scipy \
+ port:py${python.version}-matplotlib
+ }
+
+ subport py${python.vers}-${distname}-statistics {
+ set python.version ${python.vers}
+ description statistics toolbox for py${python.version}-pyphant
+ long_description This toolbox provides the histogram worker which enables \
+ the py${python.version}-pyphant framework to obtain histograms from \
+ array-like data.
+
+ distname ${distname}.statistics-${version}
+ checksums rmd160 893f87f8d9b206a71a963ba30be37e2fd4bb002f \
+ sha256 ae71e825508fe74c88693108a7bc0612416fdabb1e71442c815ccbfe2b37c7cb
+
+ depends_lib-append port:py${python.version}-numpy \
+ port:py${python.version}-scipy
+ }
+
+ subport py${python.vers}-${distname}-tools {
+ set python.version ${python.vers}
+ description tools toolbox for py${python.version}-pyphant
+ long_description This toolbox currently provides two workers for the \
+ py${python.version}-pyphant framework. These workers can be integrated \
+ in a data flow model and simply serve as data sources for \
+ data that is managed by a py${python.version}-pyphant core module called \
+ KnowledgeManager (KM). The KM accumulates metadata in a \
+ sqlite3 database and the above mentioned workers present \
+ parameters to perform a metadata search and finally \
+ load and provide the data that matched the search.
+
+ distname ${distname}.tools-${version}
+ checksums rmd160 7eabbd970968bd118a9fd93670bf79e48790d130 \
+ sha256 1d97e9b5b798047aa529148e8c5356cdbc61a3333394b5e72e8cf6b429c3b23f
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>