[114303] trunk/dports

[Lawrence Velázquez]

On Dec 4, 2013, at 2:18 PM, michaelld at macports.org wrote:

> 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: 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]} {

The frescobaldi port fails to parse because "python.python.default_version" doesn't exist. Fixed in r114304.

vq