<!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>[115351] 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/115351">115351</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2013-12-31 12:06:54 -0800 (Tue, 31 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>py-robotframework-ride: revert accidental commit <a href="https://trac.macports.org/changeset/115345">r115345</a>, delete accidental addition of py-wxpython-3.0-phoenix</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpyrobotframeworkridePortfile">trunk/dports/python/py-robotframework-ride/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/dports/python/py-wxpython-3.0-phoenix/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonpyrobotframeworkridePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-robotframework-ride/Portfile (115350 => 115351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-robotframework-ride/Portfile        2013-12-31 20:03:04 UTC (rev 115350)
+++ trunk/dports/python/py-robotframework-ride/Portfile        2013-12-31 20:06:54 UTC (rev 115351)
</span><span class="lines">@@ -4,13 +4,12 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup python 1.0
</span><span class="cx"> PortGroup wxWidgets 1.0
</span><del>-PortGroup active_variants 1.1
</del><span class="cx">
</span><span class="cx"> name py-robotframework-ride
</span><span class="cx"> set internal_name robotframework-ride
</span><span class="cx">
</span><span class="cx"> version 1.2.3
</span><del>-revision 2
</del><ins>+revision 3
</ins><span class="cx">
</span><span class="cx"> license Apache-2
</span><span class="cx">
</span><span class="lines">@@ -35,50 +34,29 @@
</span><span class="cx"> build.cmd ${python.bin} setup.py
</span><span class="cx"> destroot.cmd ${python.bin} setup.py
</span><span class="cx"> depends_lib-append port:py${python.version}-robotframework \
</span><del>- port:py${python.version}-paver
</del><ins>+ port:py${python.version}-wxpython-2.8 \
+ port:py${python.version}-paver
</ins><span class="cx">
</span><ins>+ # TODO: this port probably needs a variant to switch between py-wxpython-2.8 and py-wxpython-3.0
+ # until it starts working properly on py-wxpython-3.0
+ if {${os.major}>=12} {
+ depends_lib-delete port:py${python.version}-wxpython-2.8
+ depends_lib-append port:py${python.version}-wxpython-3.0
+ }
+
</ins><span class="cx"> post-extract {
</span><span class="cx"> reinplace "s/pybot/pybot-${python.branch}/g" $worksrcpath/src/robotide/contrib/testrunner/runprofiles.py
</span><span class="cx"> }
</span><span class="cx">
</span><del>- variant wxwidgets30 conflicts wxgtk28 wxwidgets28 description {Use wxPython 3.0 (not fully functional yet)} {
- wxWidgets.use wxPython-3.0
- depends_lib-append port:py${python.version}-wxpython-3.0
- }
-
- variant wxwidgets28 conflicts wxgtk28 wxwidgets30 description {Use 32-bit Carbon-based wxPython 2.8} {
- wxWidgets.use wxWidgets-2.8
- depends_lib-append port:py${python.version}-wxpython-2.8
- require_active_variants port:py${python.version}-wxpython-2.8 carbon gtk
- # TODO: conditionally use the following notes on x86_64 only
- notes "To run, use 'arch -i386 ride.py-${python.branch}' to use 32-bit architecture"
- }
-
- variant wxgtk28 conflicts wxwidgets28 wxwidgets30 description {Use GTK-based wxPython 2.8} {
- wxWidgets.use wxGTK-2.8
- depends_lib-append port:py${python.version}-wxpython-2.8
- require_active_variants port:py${python.version}-wxpython-2.8 gtk carbon
- }
-
- if {![variant_isset wxwidgets30] && ![variant_isset wxwidgets28] && ![variant_isset wxgtk28]} {
- if {[vercmp $xcodeversion 4.4] < 0} {
- # if wxWidgets 2.8 can be installed, it is best to use py-wxpython-2.8 anyway (except that one needs to enable 32-bit by default)
- default_variants +wxwidgets28
- } else {
- if { ${python.version} == 27} {
- # buggy
- default_variants +wxwidgets30
- } else {
- default_variants +wxgtk28
- }
- }
- }
</del><ins>+ # with 'py-wxpython-3.0' and 'py-wxpython-2.8 +gtk' this should not be needed
+ # this should only be issued when depending on 'py-wxpython-2.8 +carbon' on 64-bit OS or deleted
+ # notes "To run, use 'arch -i386 ride.py-${python.branch}' to use 32bit architecture"
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {${name} eq ${subport}} {
</span><del>- livecheck.type regex
- livecheck.url ${homepage}
- livecheck.regex ${internal_name}-(\[0-9.\]+)\\.tar\\.\[bg\]z
</del><ins>+ livecheck.type regex
+ livecheck.url ${homepage}
+ livecheck.regex ${internal_name}-(\[0-9.\]+)\\.tar\\.\[bg\]z
</ins><span class="cx"> } else {
</span><del>- livecheck.type none
</del><ins>+ livecheck.type                none
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>