<!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>[114303] trunk/dports</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/114303">114303</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2013-12-04 11:18:35 -0800 (Wed, 04 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>various dports: allow use of either py*-pyqt4 or py*-pyqt4-devel.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaquaqtiplotPortfile">trunk/dports/aqua/qtiplot/Portfile</a></li>
<li><a href="#trunkdportsdeveleric4Portfile">trunk/dports/devel/eric4/Portfile</a></li>
<li><a href="#trunkdportsdevelqbzrPortfile">trunk/dports/devel/qbzr/Portfile</a></li>
<li><a href="#trunkdportsdeveltortoisehgPortfile">trunk/dports/devel/tortoisehg/Portfile</a></li>
<li><a href="#trunkdportseditorsfrescobaldiPortfile">trunk/dports/editors/frescobaldi/Portfile</a></li>
<li><a href="#trunkdportsofficetreelinePortfile">trunk/dports/office/treeline/Portfile</a></li>
<li><a href="#trunkdportspythonninjaidePortfile">trunk/dports/python/ninja-ide/Portfile</a></li>
<li><a href="#trunkdportspythonpyPyQGLViewerPortfile">trunk/dports/python/py-PyQGLViewer/Portfile</a></li>
<li><a href="#trunkdportspythonpyipythonPortfile">trunk/dports/python/py-ipython/Portfile</a></li>
<li><a href="#trunkdportspythonpymatplotlibPortfile">trunk/dports/python/py-matplotlib/Portfile</a></li>
<li><a href="#trunkdportspythonpypyfacePortfile">trunk/dports/python/py-pyface/Portfile</a></li>
<li><a href="#trunkdportspythonpypyqwtPortfile">trunk/dports/python/py-pyqwt/Portfile</a></li>
<li><a href="#trunkdportspythonpypythonpopplerqt4Portfile">trunk/dports/python/py-python-poppler-qt4/Portfile</a></li>
<li><a href="#trunkdportspythonpyqscintillaPortfile">trunk/dports/python/py-qscintilla/Portfile</a></li>
<li><a href="#trunkdportspythonpyqutipPortfile">trunk/dports/python/py-qutip/Portfile</a></li>
<li><a href="#trunkdportspythonpyspyderPortfile">trunk/dports/python/py-spyder/Portfile</a></li>
<li><a href="#trunkdportspythonpyspyderdevelPortfile">trunk/dports/python/py-spyder-devel/Portfile</a></li>
<li><a href="#trunkdportspythonpysunpyPortfile">trunk/dports/python/py-sunpy/Portfile</a></li>
<li><a href="#trunkdportspythonpytrepPortfile">trunk/dports/python/py-trep/Portfile</a></li>
<li><a href="#trunkdportspythonpy26ete2Portfile">trunk/dports/python/py26-ete2/Portfile</a></li>
<li><a href="#trunkdportssciencegnuradioPortfile">trunk/dports/science/gnuradio/Portfile</a></li>
<li><a href="#trunkdportsscienceomplPortfile">trunk/dports/science/ompl/Portfile</a></li>
<li><a href="#trunkdportsscienceplplotPortfile">trunk/dports/science/plplot/Portfile</a></li>
<li><a href="#trunkdportssysutilstimedrivePortfile">trunk/dports/sysutils/timedrive/Portfile</a></li>
<li><a href="#trunkdportswwwlinkcheckerPortfile">trunk/dports/www/linkchecker/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsaquaqtiplotPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/qtiplot/Portfile (114302 => 114303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qtiplot/Portfile 2013-12-04 19:02:14 UTC (rev 114302)
+++ trunk/dports/aqua/qtiplot/Portfile 2013-12-04 19:18:35 UTC (rev 114303)
</span><span class="lines">@@ -149,19 +149,22 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant python25 conflicts python26 python27 description "add support for python26 scripting" {
</span><ins>+ # Can use either py*-pyqt4 or py*-pyqt4-devel.
</ins><span class="cx"> depends_lib-append port:python25 \
</span><span class="cx"> port:py25-sip \
</span><del>- port:py25-pyqt4
</del><ins>+ path:share/py25-sip/PyQt4:py25-pyqt4
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant python26 conflicts python25 python27 description "add support for python26 scripting" {
</span><ins>+ # Can use either py*-pyqt4 or py*-pyqt4-devel.
</ins><span class="cx"> depends_lib-append port:python26 \
</span><span class="cx"> port:py26-sip \
</span><del>- port:py26-pyqt4
</del><ins>+ path:share/py26-sip/PyQt4:py26-pyqt4
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant python27 conflicts python25 python26 description "add support for python26 scripting" {
</span><ins>+ # Can use either py*-pyqt4 or py*-pyqt4-devel.
</ins><span class="cx"> depends_lib-append port:python27 \
</span><span class="cx"> port:py27-sip \
</span><del>- port:py27-pyqt4
</del><ins>+ path:share/py27-sip/PyQt4:py27-pyqt4
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsdeveleric4Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/eric4/Portfile (114302 => 114303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/eric4/Portfile 2013-12-04 19:02:14 UTC (rev 114302)
+++ trunk/dports/devel/eric4/Portfile 2013-12-04 19:18:35 UTC (rev 114303)
</span><span class="lines">@@ -26,8 +26,9 @@
</span><span class="cx"> checksums rmd160 0b01bb4c46c4ac959b5f45f037caeece624c504d \
</span><span class="cx"> sha256 7032ff5758455b89fe733b41956e8ea60e215c4381603e897116cd15bb29da65
</span><span class="cx">
</span><ins>+# Can use either py*-pyqt4 or py*-pyqt4-devel.
</ins><span class="cx"> depends_lib port:python27 \
</span><del>- port:py27-pyqt4 \
</del><ins>+ path:share/py27-sip/PyQt4:py27-pyqt4 \
</ins><span class="cx"> port:py27-qscintilla \
</span><span class="cx"> port:py27-pysvn \
</span><span class="cx"> port:py27-rope \
</span></span></pre></div>
<a id="trunkdportsdevelqbzrPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/qbzr/Portfile (114302 => 114303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/qbzr/Portfile 2013-12-04 19:02:14 UTC (rev 114302)
+++ trunk/dports/devel/qbzr/Portfile 2013-12-04 19:18:35 UTC (rev 114303)
</span><span class="lines">@@ -26,8 +26,9 @@
</span><span class="cx">
</span><span class="cx"> supported_archs noarch
</span><span class="cx">
</span><ins>+# Can use either py*-pyqt4 or py*-pyqt4-devel.
</ins><span class="cx"> depends_lib-append port:bzr \
</span><del>- port:py27-pyqt4 \
</del><ins>+ path:share/py27-sip/PyQt4:py27-pyqt4 \
</ins><span class="cx"> port:py27-pygments
</span><span class="cx">
</span><span class="cx"> livecheck.type regex
</span></span></pre></div>
<a id="trunkdportsdeveltortoisehgPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/tortoisehg/Portfile (114302 => 114303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/tortoisehg/Portfile 2013-12-04 19:02:14 UTC (rev 114302)
+++ trunk/dports/devel/tortoisehg/Portfile 2013-12-04 19:18:35 UTC (rev 114303)
</span><span class="lines">@@ -26,8 +26,9 @@
</span><span class="cx">
</span><span class="cx"> python.default_version 27
</span><span class="cx">
</span><ins>+# Can use either py*-pyqt4 or py*-pyqt4-devel.
</ins><span class="cx"> depends_lib port:mercurial \
</span><del>- port:py${python.version}-pyqt4 \
</del><ins>+ path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \
</ins><span class="cx"> port:py${python.version}-qscintilla \
</span><span class="cx"> port:py${python.version}-iniparse
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportseditorsfrescobaldiPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/editors/frescobaldi/Portfile (114302 => 114303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/frescobaldi/Portfile 2013-12-04 19:02:14 UTC (rev 114302)
+++ trunk/dports/editors/frescobaldi/Portfile 2013-12-04 19:18:35 UTC (rev 114303)
</span><span class="lines">@@ -46,12 +46,14 @@
</span><span class="cx">
</span><span class="cx"> variant python26 conflicts python27 description {Use Python 2.6} {
</span><span class="cx"> python.default_version 26
</span><del>- depends_run-append port:py${python.default_version}-pyqt4 \
</del><ins>+ # Can use either py*-pyqt4 or py*-pyqt4-devel.
+ depends_run-append path:share/py${python.python.default_version}-sip/PyQt4:py${python.python.default_version}-pyqt4 \
</ins><span class="cx"> port:py${python.default_version}-python-poppler-qt4
</span><span class="cx"> }
</span><span class="cx"> variant python27 conflicts python26 description {Use Python 2.7} {
</span><span class="cx"> python.default_version 27
</span><del>- depends_run-append port:py${python.default_version}-pyqt4 \
</del><ins>+ # Can use either py*-pyqt4 or py*-pyqt4-devel.
+ depends_run-append path:share/py${python.python.default_version}-sip/PyQt4:py${python.python.default_version}-pyqt4 \
</ins><span class="cx"> port:py${python.default_version}-python-poppler-qt4
</span><span class="cx"> }
</span><span class="cx"> if {![variant_isset python26]} {
</span></span></pre></div>
<a id="trunkdportsofficetreelinePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/office/treeline/Portfile (114302 => 114303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/office/treeline/Portfile 2013-12-04 19:02:14 UTC (rev 114302)
+++ trunk/dports/office/treeline/Portfile 2013-12-04 19:18:35 UTC (rev 114303)
</span><span class="lines">@@ -24,8 +24,10 @@
</span><span class="cx"> checksums md5 6919a85cdb46238c00b2c5bf19c9f89c \
</span><span class="cx"> sha1 fae4e0511422c7bdcb3d26b31e3cebaec5446774 \
</span><span class="cx"> rmd160 72dea37eabedb595ca6c690d98f8b2b8aec74a1d
</span><del>-depends_lib port:py25-pyqt4 port:aspell
</del><span class="cx">
</span><ins>+# Can use either py*-pyqt4 or py*-pyqt4-devel.
+depends_lib path:share/py25-sip/PyQt4:py25-pyqt4 port:aspell
+
</ins><span class="cx"> patchfiles patch-SaveWindowGeom.diff
</span><span class="cx"> destroot.cmd ${prefix}/bin/python2.5 install.py
</span><span class="cx"> destroot.target
</span></span></pre></div>
<a id="trunkdportspythonninjaidePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/ninja-ide/Portfile (114302 => 114303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/ninja-ide/Portfile 2013-12-04 19:02:14 UTC (rev 114302)
+++ trunk/dports/python/ninja-ide/Portfile 2013-12-04 19:18:35 UTC (rev 114303)
</span><span class="lines">@@ -19,7 +19,9 @@
</span><span class="cx"> platforms darwin
</span><span class="cx">
</span><span class="cx"> depends_build-append port:py${python.version}-setuptools
</span><del>-depends_lib-append port:py${python.version}-pyqt4 \
</del><ins>+
+# Can use either py*-pyqt4 or py*-pyqt4-devel.
+depends_lib-append path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \
</ins><span class="cx"> port:py${python.version}-macfsevents
</span><span class="cx">
</span><span class="cx"> checksums rmd160 9fbd461bec3912dcdccb5d06b302bad1ef8ad4d3 \
</span></span></pre></div>
<a id="trunkdportspythonpyPyQGLViewerPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-PyQGLViewer/Portfile (114302 => 114303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-PyQGLViewer/Portfile 2013-12-04 19:02:14 UTC (rev 114302)
+++ trunk/dports/python/py-PyQGLViewer/Portfile 2013-12-04 19:18:35 UTC (rev 114303)
</span><span class="lines">@@ -38,8 +38,9 @@
</span><span class="cx"> if {$subport ne $name} {
</span><span class="cx"> depends_build-append port:mesa
</span><span class="cx">
</span><ins>+ # Can use either py*-pyqt4 or py*-pyqt4-devel.
</ins><span class="cx"> depends_lib-append port:libPyQGLViewer \
</span><del>- port:py${python.version}-pyqt4 \
</del><ins>+ path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \
</ins><span class="cx"> port:py${python.version}-sip
</span><span class="cx">
</span><span class="cx"> use_configure yes
</span></span></pre></div>
<a id="trunkdportspythonpyipythonPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-ipython/Portfile (114302 => 114303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-ipython/Portfile 2013-12-04 19:02:14 UTC (rev 114302)
+++ trunk/dports/python/py-ipython/Portfile 2013-12-04 19:18:35 UTC (rev 114303)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx">
</span><span class="cx"> variant pyqt4 conflicts pyside requires parallel description "Support for the Qt console using pyqt4" {
</span><span class="cx"> # Can use either py*-pyqt4 or py*-pyqt4-devel.
</span><del>- depends_lib-append path:share/qt4/plugins/designer/libpy${python.version}qt4.dylib:py${python.version}-pyqt4 \
</del><ins>+ depends_lib-append path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \
</ins><span class="cx"> port:py${python.version}-pygments
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportspythonpymatplotlibPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-matplotlib/Portfile (114302 => 114303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-matplotlib/Portfile 2013-12-04 19:02:14 UTC (rev 114302)
+++ trunk/dports/python/py-matplotlib/Portfile 2013-12-04 19:18:35 UTC (rev 114303)
</span><span class="lines">@@ -91,7 +91,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant qt4 description "Enable QT4Agg backend" {
</span><del>- depends_lib-append path:share/qt4/plugins/designer/libpy${python.version}qt4.dylib:py${python.version}-pyqt4
</del><ins>+ # Can use either py*-pyqt4 or py*-pyqt4-devel.
+ depends_lib-append path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4
</ins><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|^qt4agg=False|qt4agg=True|" ${worksrcpath}/setup.cfg
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportspythonpypyfacePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-pyface/Portfile (114302 => 114303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-pyface/Portfile 2013-12-04 19:02:14 UTC (rev 114302)
+++ trunk/dports/python/py-pyface/Portfile 2013-12-04 19:18:35 UTC (rev 114303)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> variant pyqt4 conflicts pyside description "Qt backend using PyQt4" {
</span><span class="cx"> if {$subport != $name} {
</span><span class="cx"> # Can use either py*-pyqt4 or py*-pyqt4-devel.
</span><del>- depends_lib-append path:share/qt4/plugins/designer/libpy${python.version}qt4.dylib:py${python.version}-pyqt4
</del><ins>+ depends_lib-append path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportspythonpypyqwtPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-pyqwt/Portfile (114302 => 114303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-pyqwt/Portfile 2013-12-04 19:02:14 UTC (rev 114302)
+++ trunk/dports/python/py-pyqwt/Portfile 2013-12-04 19:18:35 UTC (rev 114303)
</span><span class="lines">@@ -37,8 +37,7 @@
</span><span class="cx"> use_configure yes
</span><span class="cx">
</span><span class="cx"> # Can use either py*-pyqt4 or py*-pyqt4-devel.
</span><del>-
- depends_lib-append path:share/qt4/plugins/designer/libpy${python.version}qt4.dylib:py${python.version}-pyqt4 \
</del><ins>+ depends_lib-append path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \
</ins><span class="cx"> port:py${python.version}-numpy \
</span><span class="cx"> port:py${python.version}-sip
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportspythonpypythonpopplerqt4Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-python-poppler-qt4/Portfile (114302 => 114303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-python-poppler-qt4/Portfile 2013-12-04 19:02:14 UTC (rev 114302)
+++ trunk/dports/python/py-python-poppler-qt4/Portfile 2013-12-04 19:18:35 UTC (rev 114303)
</span><span class="lines">@@ -26,9 +26,10 @@
</span><span class="cx"> if {$subport != $name} {
</span><span class="cx"> depends_build-append port:pkgconfig
</span><span class="cx">
</span><ins>+ # Can use either py*-pyqt4 or py*-pyqt4-devel.
</ins><span class="cx"> depends_lib-append port:poppler \
</span><span class="cx"> port:qt4-mac \
</span><del>- port:py${python.version}-pyqt4 \
</del><ins>+ path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \
</ins><span class="cx"> port:py${python.version}-sip
</span><span class="cx">
</span><span class="cx"> require_active_variants poppler {qt4 quartz}
</span></span></pre></div>
<a id="trunkdportspythonpyqscintillaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-qscintilla/Portfile (114302 => 114303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-qscintilla/Portfile 2013-12-04 19:02:14 UTC (rev 114302)
+++ trunk/dports/python/py-qscintilla/Portfile 2013-12-04 19:18:35 UTC (rev 114303)
</span><span class="lines">@@ -37,6 +37,8 @@
</span><span class="cx"> if {$subport != $name} {
</span><span class="cx">
</span><span class="cx"> depends_lib-append port:qscintilla
</span><ins>+
+ # Can use either py*-pyqt4 or py*-pyqt4-devel.
</ins><span class="cx"> depends_lib-append path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4
</span><span class="cx">
</span><span class="cx"> universal_variant no
</span></span></pre></div>
<a id="trunkdportspythonpyqutipPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-qutip/Portfile (114302 => 114303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-qutip/Portfile 2013-12-04 19:02:14 UTC (rev 114302)
+++ trunk/dports/python/py-qutip/Portfile 2013-12-04 19:18:35 UTC (rev 114303)
</span><span class="lines">@@ -28,12 +28,13 @@
</span><span class="cx">
</span><span class="cx"> # py-scipy is not universal
</span><span class="cx"> if {$subport != $name} {
</span><ins>+ # Can use either py*-pyqt4 or py*-pyqt4-devel.
</ins><span class="cx"> depends_lib-append port:py${python.version}-cython \
</span><span class="cx"> port:py${python.version}-ipython \
</span><span class="cx"> port:py${python.version}-matplotlib \
</span><span class="cx"> port:py${python.version}-mayavi \
</span><span class="cx"> port:py${python.version}-numpy \
</span><del>- port:py${python.version}-pyqt4 \
</del><ins>+ path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \
</ins><span class="cx"> port:py${python.version}-scipy \
</span><span class="cx"> port:vtk5
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportspythonpyspyderPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-spyder/Portfile (114302 => 114303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-spyder/Portfile 2013-12-04 19:02:14 UTC (rev 114302)
+++ trunk/dports/python/py-spyder/Portfile 2013-12-04 19:18:35 UTC (rev 114303)
</span><span class="lines">@@ -76,10 +76,11 @@
</span><span class="cx"> ${worksrcpath}/doc/conf.py
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ # Can use either py*-pyqt4 or py*-pyqt4-devel.
</ins><span class="cx"> # Bare minimum
</span><span class="cx"> depends_lib-append \
</span><del>- port:py${python.version}-pyqt4
-
</del><ins>+ path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4
+
</ins><span class="cx"> variant tiny description {
</span><span class="cx"> Remove all optional dependencies for quickest install. Dependencies\
</span><span class="cx"> are detected/enabled at runtime and may be installed separately.\
</span></span></pre></div>
<a id="trunkdportspythonpyspyderdevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-spyder-devel/Portfile (114302 => 114303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-spyder-devel/Portfile 2013-12-04 19:02:14 UTC (rev 114302)
+++ trunk/dports/python/py-spyder-devel/Portfile 2013-12-04 19:18:35 UTC (rev 114303)
</span><span class="lines">@@ -77,9 +77,10 @@
</span><span class="cx"> ${worksrcpath}/doc/conf.py
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ # Can use either py*-pyqt4 or py*-pyqt4-devel.
</ins><span class="cx"> # Bare minimum
</span><span class="cx"> depends_lib-append \
</span><del>- port:py${python.version}-pyqt4 \
</del><ins>+ path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \
</ins><span class="cx"> port:py${python.version}-sphinx \
</span><span class="cx"> port:py${python.version}-zmq
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportspythonpysunpyPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-sunpy/Portfile (114302 => 114303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-sunpy/Portfile 2013-12-04 19:02:14 UTC (rev 114302)
+++ trunk/dports/python/py-sunpy/Portfile 2013-12-04 19:18:35 UTC (rev 114303)
</span><span class="lines">@@ -31,10 +31,11 @@
</span><span class="cx">
</span><span class="cx"> depends_build-append port:py${python.version}-numpy
</span><span class="cx">
</span><ins>+ # Can use either py*-pyqt4 or py*-pyqt4-devel.
</ins><span class="cx"> depends_lib-append port:py${python.version}-scipy \
</span><span class="cx"> port:py${python.version}-matplotlib \
</span><span class="cx"> port:py${python.version}-astropy \
</span><del>- port:py${python.version}-pyqt4 \
</del><ins>+ path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \
</ins><span class="cx"> port:py${python.version}-suds \
</span><span class="cx"> port:py${python.version}-pandas \
</span><span class="cx"> port:py${python.version}-beautifulsoup4 \
</span></span></pre></div>
<a id="trunkdportspythonpytrepPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-trep/Portfile (114302 => 114303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-trep/Portfile 2013-12-04 19:02:14 UTC (rev 114302)
+++ trunk/dports/python/py-trep/Portfile 2013-12-04 19:18:35 UTC (rev 114303)
</span><span class="lines">@@ -32,11 +32,13 @@
</span><span class="cx">
</span><span class="cx"> if {$subport != $name} {
</span><span class="cx"> patchfiles patch-setup.py.diff
</span><ins>+
+ # Can use either py*-pyqt4 or py*-pyqt4-devel.
</ins><span class="cx"> depends_lib port:py${python.version}-numpy \
</span><span class="cx"> port:py${python.version}-scipy \
</span><span class="cx"> port:py${python.version}-matplotlib \
</span><span class="cx"> port:py${python.version}-opengl \
</span><del>- port:py${python.version}-pyqt4 \
</del><ins>+ path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \
</ins><span class="cx"> port:py${python.version}-sphinx
</span><span class="cx"> build.target-append build_sphinx
</span><span class="cx"> post-destroot {
</span></span></pre></div>
<a id="trunkdportspythonpy26ete2Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py26-ete2/Portfile (114302 => 114303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py26-ete2/Portfile 2013-12-04 19:02:14 UTC (rev 114302)
+++ trunk/dports/python/py26-ete2/Portfile 2013-12-04 19:18:35 UTC (rev 114303)
</span><span class="lines">@@ -32,9 +32,11 @@
</span><span class="cx"> distname ete2-${version}
</span><span class="cx">
</span><span class="cx"> depends_build port:py26-setuptools
</span><ins>+
+# Can use either py*-pyqt4 or py*-pyqt4-devel.
</ins><span class="cx"> depends_run port:py26-mysql \
</span><span class="cx"> port:py26-scipy \
</span><del>- port:py26-pyqt4
</del><ins>+ path:share/py26-sip/PyQt4:py26-pyqt4
</ins><span class="cx">
</span><span class="cx"> # py26-scipy is not universal
</span><span class="cx"> universal_variant no
</span></span></pre></div>
<a id="trunkdportssciencegnuradioPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gnuradio/Portfile (114302 => 114303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gnuradio/Portfile 2013-12-04 19:02:14 UTC (rev 114302)
+++ trunk/dports/science/gnuradio/Portfile 2013-12-04 19:18:35 UTC (rev 114303)
</span><span class="lines">@@ -321,7 +321,7 @@
</span><span class="cx"> # either py*-pyqt4 or py*-pyqt4-devel.
</span><span class="cx">
</span><span class="cx"> depends_lib-append \
</span><del>- path:share/qt4/plugins/designer/libpy${s}qt4.dylib:py${s}-pyqt4
</del><ins>+ path:share/py${s}-sip/PyQt4:py${s}-pyqt4
</ins><span class="cx">
</span><span class="cx"> # pyqwt is not checked for at configure, but is
</span><span class="cx"> # required for runtime; so use depends_run.
</span></span></pre></div>
<a id="trunkdportsscienceomplPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/ompl/Portfile (114302 => 114303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/ompl/Portfile 2013-12-04 19:02:14 UTC (rev 114302)
+++ trunk/dports/science/ompl/Portfile 2013-12-04 19:18:35 UTC (rev 114303)
</span><span class="lines">@@ -105,8 +105,11 @@
</span><span class="cx"> # the python bindings rely on Boost.Python, so make sure it is installed.
</span><span class="cx"> require_active_variants boost ${p}
</span><span class="cx">
</span><del>- if { [variant_isset app] } {
- depends_lib-append port:py${s}-pyqt4 port:py${s}-opengl
</del><ins>+ if { [variant_isset app] } {
+ # Can use either py*-pyqt4 or py*-pyqt4-devel.
+ depends_lib-append \
+ path:share/py${s}-sip/PyQt4:py${s}-pyqt4 \
+ port:py${s}-opengl
</ins><span class="cx"> post-destroot {
</span><span class="cx"> reinplace "s|#!/usr/bin/env python|#!${prefix}/bin/python${v}|g" \
</span><span class="cx"> ${destroot}${prefix}/bin/ompl_app
</span></span></pre></div>
<a id="trunkdportsscienceplplotPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/plplot/Portfile (114302 => 114303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/plplot/Portfile 2013-12-04 19:02:14 UTC (rev 114302)
+++ trunk/dports/science/plplot/Portfile 2013-12-04 19:18:35 UTC (rev 114303)
</span><span class="lines">@@ -290,17 +290,20 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant py25_pyqt4 requires python25 description {Add support for pyQT4 using python25} {
</span><del>- depends_lib-append port:py25-pyqt4
</del><ins>+ # Can use either py*-pyqt4 or py*-pyqt4-devel.
+ depends_lib-append path:share/py25-sip/PyQt4:py25-pyqt4
</ins><span class="cx"> configure.args-delete -DENABLE_pyqt4=OFF
</span><span class="cx"> configure.args-append -DENABLE_pyqt4=ON
</span><span class="cx"> }
</span><span class="cx"> variant py26_pyqt4 requires python26 description {Add support for pyQT4 using python26} {
</span><del>- depends_lib-append port:py26-pyqt4
</del><ins>+ # Can use either py*-pyqt4 or py*-pyqt4-devel.
+ depends_lib-append path:share/py26-sip/PyQt4:py26-pyqt4
</ins><span class="cx"> configure.args-delete -DENABLE_pyqt4=OFF
</span><span class="cx"> configure.args-append -DENABLE_pyqt4=ON
</span><span class="cx"> }
</span><span class="cx"> variant py27_pyqt4 requires python27 description {Add support for pyQT4 using python27} {
</span><del>- depends_lib-append port:py27-pyqt4
</del><ins>+ # Can use either py*-pyqt4 or py*-pyqt4-devel.
+ depends_lib-append path:share/py27-sip/PyQt4:py27-pyqt4
</ins><span class="cx"> configure.args-delete -DENABLE_pyqt4=OFF
</span><span class="cx"> configure.args-append -DENABLE_pyqt4=ON
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportssysutilstimedrivePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/sysutils/timedrive/Portfile (114302 => 114303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/timedrive/Portfile 2013-12-04 19:02:14 UTC (rev 114302)
+++ trunk/dports/sysutils/timedrive/Portfile 2013-12-04 19:18:35 UTC (rev 114303)
</span><span class="lines">@@ -18,8 +18,10 @@
</span><span class="cx"> homepage http://www.oak-tree.us/time-drive
</span><span class="cx">
</span><span class="cx"> platforms darwin
</span><ins>+
+# Can use either py*-pyqt4 or py*-pyqt4-devel.
</ins><span class="cx"> depends_build-append \
</span><del>- port:py27-pyqt4 \
</del><ins>+ path:share/py27-sip/PyQt4:py27-pyqt4 \
</ins><span class="cx"> port:py27-sip \
</span><span class="cx"> port:py27-setuptools
</span><span class="cx"> depends_lib-append port:duplicity
</span></span></pre></div>
<a id="trunkdportswwwlinkcheckerPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/linkchecker/Portfile (114302 => 114303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/linkchecker/Portfile 2013-12-04 19:02:14 UTC (rev 114302)
+++ trunk/dports/www/linkchecker/Portfile 2013-12-04 19:18:35 UTC (rev 114303)
</span><span class="lines">@@ -36,7 +36,8 @@
</span><span class="cx">
</span><span class="cx"> python.default_version 27
</span><span class="cx">
</span><del>-depends_lib-append port:py27-pyqt4
</del><ins>+# Can use either py*-pyqt4 or py*-pyqt4-devel.
+depends_lib-append path:share/py27-sip/PyQt4:py27-pyqt4
</ins><span class="cx">
</span><span class="cx"> pre-build {
</span><span class="cx"> system "cd ${worksrcpath} && make -C doc/html"
</span></span></pre>
</div>
</div>
</body>
</html>