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