<!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>[120504] users/mojca/wxports/python/py-pyphant/Portfile</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/120504">120504</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-05-30 12:20:03 -0700 (Fri, 30 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>mojca/py-pyphant: py26 ports replaced_by py27</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersmojcawxportspythonpypyphantPortfile">users/mojca/wxports/python/py-pyphant/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersmojcawxportspythonpypyphantPortfile"></a>
<div class="modfile"><h4>Modified: users/mojca/wxports/python/py-pyphant/Portfile (120503 => 120504)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/wxports/python/py-pyphant/Portfile 2014-05-30 16:33:20 UTC (rev 120503)
+++ users/mojca/wxports/python/py-pyphant/Portfile 2014-05-30 19:20:03 UTC (rev 120504)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx">
</span><span class="cx"> name py-pyphant
</span><span class="cx"> version 1.0b3
</span><del>-# revision 1
</del><ins>+revision 1
</ins><span class="cx"> categories-append science
</span><span class="cx"> maintainers fmf.uni-freiburg.de:servicegruppe.wissinfo \
</span><span class="cx"> fmf.uni-freiburg.de:alexander.held rowue
</span><span class="lines">@@ -42,8 +42,7 @@
</span><span class="cx">
</span><span class="cx"> platforms darwin
</span><span class="cx">
</span><del>-python.versions 26 27
-python.default_version 27
</del><ins>+python.versions 27
</ins><span class="cx">
</span><span class="cx"> # py-scipy is not universal
</span><span class="cx"> universal_variant no
</span><span class="lines">@@ -61,6 +60,24 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+# these two could probably be combined
+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"> foreach python.vers ${python.versions} {
</span><span class="cx"> subport py${python.vers}-${distname} {
</span><span class="cx"> PortGroup app 1.0
</span><span class="lines">@@ -74,6 +91,8 @@
</span><span class="cx"> app.executable pyphant-${python.branch}
</span><span class="cx"> app.icon ${filespath}/Pyphant.icns
</span><span class="cx">
</span><ins>+ wxWidgets.use wxPython-3.0
+
</ins><span class="cx"> # TODO: check which ones of these are runtime dependencies as opposed to dependencies for building
</span><span class="cx"> depends_lib-append port:py${python.version}-numpy \
</span><span class="cx"> port:py${python.version}-scipy \
</span><span class="lines">@@ -84,38 +103,14 @@
</span><span class="cx"> port:py${python.version}-paste \
</span><span class="cx"> port:py${python.version}-mx-base \
</span><span class="cx"> port:py${python.version}-sogl \
</span><del>-
</del><ins>+ port:py${python.version}-wxpython-3.0
+
</ins><span class="cx"> depends_run-append port:py${python.version}-configobj \
</span><span class="cx"> port:py${python.version}-tornado
</span><span class="cx">
</span><del>- # TODO: remove support for wxGTK one day
- variant wxgtk28 conflicts wxwidgets30 description {Use 32-bit carbon-based wxPython 2.8} {
- wxWidgets.use wxGTK-2.8
- depends_lib-append port:py${python.version}-wxpython-2.8
- require_active_variants py${python.version}-wxpython-2.8 gtk
- }
- variant wxwidgets30 conflicts wxgtk28 escription {Use wxPython 3.0} {
- wxWidgets.use wxPython-3.0
- depends_lib-append port:py${python.version}-wxpython-3.0
- }
- if {![variant_isset wxgtk28] && ![variant_isset wxwidgets30]} {
- # TODO: check which version of py${python.version}-wxpython-X.Y is installed instead
- # and use 3.0 by default unless py2.x-wxpython-2.8 is already active
- if {${python.version} == 26} {
- default_variants +wxgtk28
- } else {
- default_variants +wxwidgets30
- }
- }
</del><span class="cx"> pre-destroot {
</span><del>- if {[variant_isset wxwidgets30]} {
- 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}
- }
</del><ins>+ file copy ${filespath}/pyphant.quartz ${destroot}${prefix}/bin
+ file rename ${destroot}${prefix}/bin/pyphant.quartz ${destroot}${prefix}/bin/pyphant-${python.branch}
</ins><span class="cx"> reinplace "s|@PREFIX@|${prefix}|" ${destroot}${prefix}/bin/pyphant-${python.branch}
</span><span class="cx"> reinplace "s|@PYTHONBRANCH@|${python.branch}|" ${destroot}${prefix}/bin/pyphant-${python.branch}
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>