<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d21e1c21b80a23c85738f41ef31f23931b3feac7">https://github.com/macports/macports-ports/commit/d21e1c21b80a23c85738f41ef31f23931b3feac7</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new d21e1c2 various: there is no py*-pyqt4-devel, so remove any dependence on it.
</span>d21e1c2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d21e1c21b80a23c85738f41ef31f23931b3feac7
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Thu Jul 13 10:08:39 2017 -0400
<span style='display:block; white-space:pre;color:#404040;'> various: there is no py*-pyqt4-devel, so remove any dependence on it.
</span>---
aqua/qtiplot/Portfile | 3 +--
devel/eric4/Portfile | 3 +--
devel/qbzr/Portfile | 3 +--
devel/tortoisehg/Portfile | 5 ++---
editors/frescobaldi/Portfile | 3 +--
office/treeline/Portfile | 3 +--
python/ninja-ide/Portfile | 3 +--
python/py-PyQGLViewer/Portfile | 3 +--
python/py-ete2/Portfile | 3 +--
python/py-matplotlib/Portfile | 3 +--
python/py-poppler-qt4/Portfile | 3 +--
python/py-pyface/Portfile | 3 +--
python/py-qscintilla/Portfile | 6 ++----
python/py-spyder/Portfile | 3 +--
python/py-sunpy/Portfile | 3 +--
python/py-trep/Portfile | 3 +--
science/gnuradio/Portfile | 5 ++---
science/gr-air-modes/Portfile | 5 ++---
science/plplot/Portfile | 3 +--
science/plplot510/Portfile | 3 +--
science/scidavis/Portfile | 3 +--
www/linkchecker/Portfile | 5 ++---
22 files changed, 27 insertions(+), 50 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qtiplot/Portfile b/aqua/qtiplot/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f56552d..d05b39e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qtiplot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qtiplot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -154,10 +154,9 @@ variant python27 description "add support for python27 scripting" {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Can use either py*-pyqt4 or py*-pyqt4-devel.
</span> depends_lib-append port:python27 \
port:py27-sip \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:share/py27-sip/PyQt4:py27-pyqt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-pyqt4
</span> }
livecheck.type none
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/eric4/Portfile b/devel/eric4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b0dc2e2..d503fdb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/eric4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/eric4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,9 +25,8 @@ master_sites sourceforge:project/eric-ide/${name}/stable/${version}/
</span> checksums rmd160 0b01bb4c46c4ac959b5f45f037caeece624c504d \
sha256 7032ff5758455b89fe733b41956e8ea60e215c4381603e897116cd15bb29da65
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Can use either py*-pyqt4 or py*-pyqt4-devel.
</span> depends_lib port:python27 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:share/py27-sip/PyQt4:py27-pyqt4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-pyqt4 \
</span> port:py27-qscintilla \
port:py27-pysvn \
port:py27-rope \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qbzr/Portfile b/devel/qbzr/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7ad75cf..ae195d3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qbzr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qbzr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,9 +26,8 @@ supported_archs noarch
</span>
python.default_version 27
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Can use either py*-pyqt4 or py*-pyqt4-devel.
</span> depends_lib-append port:bzr \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pyqt4 \
</span> port:py${python.version}-pygments
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/tortoisehg/Portfile b/devel/tortoisehg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 018f23c..fd421c7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/tortoisehg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/tortoisehg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,10 +23,9 @@ checksums rmd160 de67543847e01372b485e671c1bffac0bbb565f7 \
</span>
python.default_version 27
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Can use either py*-pyqt4 or py*-pyqt4-devel. Also mercurial or
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# mercurial-devel.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Can use either mercurial or mercurial-devel.
</span> depends_lib path:bin/hg:mercurial \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pyqt4 \
</span> port:py${python.version}-qscintilla \
port:py${python.version}-iniparse
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/frescobaldi/Portfile b/editors/frescobaldi/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e715bad..d84dfaf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/frescobaldi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/frescobaldi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,8 +36,7 @@ python.default_version 35
</span> depends_build-append port:py${python.version}-setuptools
depends_lib-append port:py${python.version}-ly
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Can use either py*-pyqt4 or py*-pyqt4-devel.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run-append path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run-append port:py${python.version}-pyqt4 \
</span> port:py${python.version}-poppler-qt4
variant app description {Make application bundle} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/office/treeline/Portfile b/office/treeline/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1c0e798..ab6a226 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/office/treeline/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/office/treeline/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,8 +25,7 @@ checksums rmd160 8649430eb07e6816acca6ea89f17cb8a309c3f68 \
</span>
worksrcdir TreeLine
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Can use either py*-pyqt4 or py*-pyqt4-devel.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:share/py27-sip/PyQt4:py27-pyqt4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:py27-pyqt4 \
</span> port:aspell
patchfiles patch-SaveWindowGeom.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/ninja-ide/Portfile b/python/ninja-ide/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5e42d0e..b775ff1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/ninja-ide/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/ninja-ide/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,8 +19,7 @@ platforms darwin
</span>
depends_build-append port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Can use either py*-pyqt4 or py*-pyqt4-devel.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:py${python.version}-pyqt4 \
</span> port:py${python.version}-macfsevents
checksums rmd160 9fbd461bec3912dcdccb5d06b302bad1ef8ad4d3 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-PyQGLViewer/Portfile b/python/py-PyQGLViewer/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7689894..6a04ac9 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-PyQGLViewer/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-PyQGLViewer/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,8 +38,7 @@ python.versions 27
</span> if {${name} ne ${subport}} {
depends_build-append port:mesa
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Can use either py*-pyqt4 or py*-pyqt4-devel.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${python.version}-pyqt4 \
</span> port:libQGLViewer \
port:py${python.version}-sip
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-ete2/Portfile b/python/py-ete2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 00dc502..c205320 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-ete2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-ete2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,10 +38,9 @@ python.versions 27
</span> if {$subport ne $name} {
depends_build-append port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Can use either py*-pyqt4 or py*-pyqt4-devel.
</span> depends_lib-append port:py${python.version}-mysql \
port:py${python.version}-scipy \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pyqt4
</span>
# py*-scipy is not universal
universal_variant no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/Portfile b/python/py-matplotlib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cecb714..8457bf3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-matplotlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-matplotlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,8 +108,7 @@ if {${name} ne ${subport}} {
</span> }
variant qt4 description "Enable QT4Agg backend" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Can use either py*-pyqt4 or py*-pyqt4-devel.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${python.version}-pyqt4
</span> post-patch {
reinplace "s|^qt4agg=False|qt4agg=True|" ${worksrcpath}/setup.cfg
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-poppler-qt4/Portfile b/python/py-poppler-qt4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2cf9268..0c1b0b0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-poppler-qt4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-poppler-qt4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,11 +33,10 @@ python.versions 27 34 35 36
</span> if {${name} ne ${subport}} {
depends_build-append port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Can use either py*-pyqt4 or py*-pyqt4-devel.
</span> depends_lib-append port:poppler-qt4-mac \
port:qt4-mac \
port:py${python.version}-sip \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pyqt4
</span>
post-destroot {
set doc_dir ${destroot}${prefix}/share/doc/${subport}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyface/Portfile b/python/py-pyface/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f0c677a..ac05f58 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyface/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pyface/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,8 +35,7 @@ if {${name} ne ${subport}} {
</span> }
variant pyqt4 description "Qt backend using PyQt4" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Can use either py*-pyqt4 or py*-pyqt4-devel.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${python.version}-pyqt4
</span> }
variant pyside description "Qt backend using PySide" {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-qscintilla/Portfile b/python/py-qscintilla/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ccfb772..76e8932 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-qscintilla/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-qscintilla/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,10 +33,8 @@ python.default_version 27
</span>
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:qscintilla
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Can use either py*-pyqt4 or py*-pyqt4-devel.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:qscintilla \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pyqt4
</span>
patchfiles-append patch-Python-configure.py.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder/Portfile b/python/py-spyder/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d029a35..028e71e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,10 +77,9 @@ if {${name} ne ${subport}} {
</span> ${worksrcpath}/doc/conf.py
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Can use either py*-pyqt4 or py*-pyqt4-devel.
</span> # Bare minimum
depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pyqt4
</span> port:py${python.version}-sphinx \
port:py${python.version}-zmq
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-sunpy/Portfile b/python/py-sunpy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ce4f38b..5612a0b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-sunpy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-sunpy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,11 +30,10 @@ if {${name} ne ${subport}} {
</span>
depends_build-append port:py${python.version}-numpy
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Can use either py*-pyqt4 or py*-pyqt4-devel.
</span> depends_lib-append port:py${python.version}-scipy \
port:py${python.version}-matplotlib \
port:py${python.version}-astropy \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pyqt4 \
</span> port:py${python.version}-suds \
port:py${python.version}-pandas \
port:py${python.version}-beautifulsoup4 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-trep/Portfile b/python/py-trep/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 81059e8..84b989f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-trep/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-trep/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,12 +26,11 @@ checksums md5 b2d2d66f7fbdb62d68a961f6468e8205 \
</span> python.versions 27
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Can use either py*-pyqt4 or py*-pyqt4-devel.
</span> depends_lib port:py${python.version}-numpy \
port:py${python.version}-scipy \
port:py${python.version}-matplotlib \
port:py${python.version}-opengl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pyqt4
</span> post-patch {
reinplace "s|@PKGD@|${destroot}${python.pkgd}|g" ${worksrcpath}/setup.py
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/Portfile b/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9381529..ab7a8d4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -343,11 +343,10 @@ variant qtgui description "Install GNU Radio with support for Qt GUI" {
</span> port:qwtplot3d
# pyqt4 is checked for at configure, then required for
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # runtime; so use depends_lib to get both. Can use
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # either py*-pyqt4 or py*-pyqt4-devel.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # runtime; so use depends_lib to get both.
</span>
depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:share/py27-sip/PyQt4:py27-pyqt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-pyqt4
</span>
# Requires qwt >= 5.2, so not the "qwt" port. Also requires
# py*-pyqwt which does not compile with qwt >= 6.0; so -have- to
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-air-modes/Portfile b/science/gr-air-modes/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 190c435..3fae4be 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-air-modes/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-air-modes/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,11 +77,10 @@ depends_run-append \
</span> port:py27-zmq
# pyqt4 is checked for at configure, then required for
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# runtime; so use depends_lib to get both. Can use
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# either py*-pyqt4 or py*-pyqt4-devel.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# runtime; so use depends_lib to get both.
</span>
depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:share/py27-sip/PyQt4:py27-pyqt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-pyqt4
</span>
# specify the Python version to use
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/plplot/Portfile b/science/plplot/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 751f37f..51a8f21 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/plplot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/plplot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -237,8 +237,7 @@ variant python27 conflicts python26 description {Add support for python27} {
</span> }
variant py27_pyqt4 requires python27 description {Add support for pyQT4 using python27} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Can use either py*-pyqt4 or py*-pyqt4-devel.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:share/py27-sip/PyQt4:py27-pyqt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py27-pyqt4
</span> configure.args-delete -DENABLE_pyqt4=OFF
configure.args-append -DENABLE_pyqt4=ON
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/plplot510/Portfile b/science/plplot510/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 92444c1..3607ccb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/plplot510/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/plplot510/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -234,8 +234,7 @@ variant python27 conflicts python26 description {Add support for python27} {
</span> }
variant py27_pyqt4 requires python27 description {Add support for pyQT4 using python27} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Can use either py*-pyqt4 or py*-pyqt4-devel.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:share/py27-sip/PyQt4:py27-pyqt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py27-pyqt4
</span> configure.args-delete -DENABLE_pyqt4=OFF
configure.args-append -DENABLE_pyqt4=ON
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/scidavis/Portfile b/science/scidavis/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5850a5b..f30a1cf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/scidavis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/scidavis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,10 +68,9 @@ post-destroot {
</span> }
variant python27 description "add support for python scripting" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Can use either py*-pyqt4 or py*-pyqt4-devel.
</span> depends_lib-append port:python27 \
port:py27-sip \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:share/py27-sip/PyQt4:py27-pyqt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-pyqt4
</span> }
livecheck.type sourceforge
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/linkchecker/Portfile b/www/linkchecker/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b2cbf4b..a01c127 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/linkchecker/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/linkchecker/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,9 +41,8 @@ depends_build-append port:py27-py2app \
</span> port:py27-pyobjc-cocoa \
port:py27-matplotlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Can use either py*-pyqt4 or py*-pyqt4-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append path:share/py27-sip/PyQt4:py27-pyqt4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:py27-requests
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:py27-pyqt4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-requests
</span>
patchfiles patch-version.diff
</pre><pre style='margin:0'>
</pre>