Changeset 114303


Ignore:
Timestamp:
Dec 4, 2013, 7:18:35 PM (4 years ago)
Author:
michaelld@…
Message:

various dports: allow use of either py*-pyqt4 or py*-pyqt4-devel.

Location:
trunk/dports
Files:
25 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/aqua/qtiplot/Portfile

    r108681 r114303  
    150150
    151151variant python25 conflicts python26 python27 description "add support for python26 scripting" {
     152    # Can use either py*-pyqt4 or py*-pyqt4-devel.
    152153    depends_lib-append port:python25 \
    153154                       port:py25-sip \
    154                        port:py25-pyqt4
     155                       path:share/py25-sip/PyQt4:py25-pyqt4
    155156}
    156157
    157158variant python26 conflicts python25 python27 description "add support for python26 scripting" {
     159    # Can use either py*-pyqt4 or py*-pyqt4-devel.
    158160    depends_lib-append port:python26 \
    159161                       port:py26-sip \
    160                        port:py26-pyqt4
     162                       path:share/py26-sip/PyQt4:py26-pyqt4
    161163}
    162164
    163165variant python27 conflicts python25 python26 description "add support for python26 scripting" {
     166    # Can use either py*-pyqt4 or py*-pyqt4-devel.
    164167    depends_lib-append port:python27 \
    165168                       port:py27-sip \
    166                        port:py27-pyqt4
     169                       path:share/py27-sip/PyQt4:py27-pyqt4
    167170}
  • trunk/dports/devel/eric4/Portfile

    r109632 r114303  
    2727                sha256  7032ff5758455b89fe733b41956e8ea60e215c4381603e897116cd15bb29da65
    2828
     29# Can use either py*-pyqt4 or py*-pyqt4-devel.
    2930depends_lib     port:python27 \
    30                 port:py27-pyqt4 \
     31                path:share/py27-sip/PyQt4:py27-pyqt4 \
    3132                port:py27-qscintilla \
    3233                port:py27-pysvn \
  • trunk/dports/devel/qbzr/Portfile

    r109378 r114303  
    2727supported_archs     noarch
    2828
     29# Can use either py*-pyqt4 or py*-pyqt4-devel.
    2930depends_lib-append  port:bzr \
    30                     port:py27-pyqt4 \
     31                    path:share/py27-sip/PyQt4:py27-pyqt4 \
    3132                    port:py27-pygments
    3233
  • trunk/dports/devel/tortoisehg/Portfile

    r101302 r114303  
    2727python.default_version 27
    2828
     29# Can use either py*-pyqt4 or py*-pyqt4-devel.
    2930depends_lib         port:mercurial \
    30                     port:py${python.version}-pyqt4 \
     31                    path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \
    3132                    port:py${python.version}-qscintilla \
    3233                    port:py${python.version}-iniparse
  • trunk/dports/editors/frescobaldi/Portfile

    r114020 r114303  
    4747variant python26 conflicts python27 description {Use Python 2.6} {
    4848    python.default_version  26
    49     depends_run-append      port:py${python.default_version}-pyqt4 \
     49    # Can use either py*-pyqt4 or py*-pyqt4-devel.
     50    depends_run-append      path:share/py${python.python.default_version}-sip/PyQt4:py${python.python.default_version}-pyqt4 \
    5051                            port:py${python.default_version}-python-poppler-qt4
    5152}
    5253variant python27 conflicts python26 description {Use Python 2.7} {
    5354    python.default_version  27
    54     depends_run-append      port:py${python.default_version}-pyqt4 \
     55    # Can use either py*-pyqt4 or py*-pyqt4-devel.
     56    depends_run-append      path:share/py${python.python.default_version}-sip/PyQt4:py${python.python.default_version}-pyqt4 \
    5557                            port:py${python.default_version}-python-poppler-qt4
    5658}
  • trunk/dports/office/treeline/Portfile

    r51977 r114303  
    2525                    sha1 fae4e0511422c7bdcb3d26b31e3cebaec5446774 \
    2626                    rmd160 72dea37eabedb595ca6c690d98f8b2b8aec74a1d
    27 depends_lib         port:py25-pyqt4 port:aspell
     27
     28# Can use either py*-pyqt4 or py*-pyqt4-devel.
     29depends_lib         path:share/py25-sip/PyQt4:py25-pyqt4 port:aspell
    2830
    2931patchfiles          patch-SaveWindowGeom.diff
  • trunk/dports/python/ninja-ide/Portfile

    r112005 r114303  
    2020
    2121depends_build-append port:py${python.version}-setuptools
    22 depends_lib-append  port:py${python.version}-pyqt4 \
     22
     23# Can use either py*-pyqt4 or py*-pyqt4-devel.
     24depends_lib-append  path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \
    2325                    port:py${python.version}-macfsevents
    2426
  • trunk/dports/python/py-PyQGLViewer/Portfile

    r112348 r114303  
    3939    depends_build-append port:mesa
    4040
     41    # Can use either py*-pyqt4 or py*-pyqt4-devel.
    4142    depends_lib-append  port:libPyQGLViewer \
    42                         port:py${python.version}-pyqt4 \
     43                        path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \
    4344                        port:py${python.version}-sip
    4445
  • trunk/dports/python/py-ipython/Portfile

    r114032 r114303  
    6969    variant pyqt4 conflicts pyside requires parallel description "Support for the Qt console using pyqt4" {
    7070        # Can use either py*-pyqt4 or py*-pyqt4-devel.
    71         depends_lib-append      path:share/qt4/plugins/designer/libpy${python.version}qt4.dylib:py${python.version}-pyqt4 \
     71        depends_lib-append      path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \
    7272                                port:py${python.version}-pygments
    7373    }
  • trunk/dports/python/py-matplotlib/Portfile

    r113756 r114303  
    9292
    9393    variant qt4 description "Enable QT4Agg backend" {
    94         depends_lib-append  path:share/qt4/plugins/designer/libpy${python.version}qt4.dylib:py${python.version}-pyqt4
     94        # Can use either py*-pyqt4 or py*-pyqt4-devel.
     95        depends_lib-append  path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4
    9596        post-patch {
    9697            reinplace "s|^qt4agg=False|qt4agg=True|" ${worksrcpath}/setup.cfg
  • trunk/dports/python/py-pyface/Portfile

    r114031 r114303  
    4444    if {$subport != $name} {
    4545        # Can use either py*-pyqt4 or py*-pyqt4-devel.
    46         depends_lib-append      path:share/qt4/plugins/designer/libpy${python.version}qt4.dylib:py${python.version}-pyqt4
     46        depends_lib-append      path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4
    4747    }
    4848}
  • trunk/dports/python/py-pyqwt/Portfile

    r114033 r114303  
    3838
    3939    # Can use either py*-pyqt4 or py*-pyqt4-devel.
    40 
    41     depends_lib-append path:share/qt4/plugins/designer/libpy${python.version}qt4.dylib:py${python.version}-pyqt4 \
     40    depends_lib-append path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \
    4241                       port:py${python.version}-numpy \
    4342                       port:py${python.version}-sip
  • trunk/dports/python/py-python-poppler-qt4/Portfile

    r112284 r114303  
    2727    depends_build-append    port:pkgconfig
    2828
     29    # Can use either py*-pyqt4 or py*-pyqt4-devel.
    2930    depends_lib-append      port:poppler \
    3031                            port:qt4-mac \
    31                             port:py${python.version}-pyqt4 \
     32                            path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \
    3233                            port:py${python.version}-sip
    3334
  • trunk/dports/python/py-qscintilla/Portfile

    r111888 r114303  
    3838
    3939   depends_lib-append  port:qscintilla
     40
     41   # Can use either py*-pyqt4 or py*-pyqt4-devel.
    4042   depends_lib-append  path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4
    4143
  • trunk/dports/python/py-qutip/Portfile

    r110169 r114303  
    2929# py-scipy is not universal
    3030if {$subport != $name} {
     31    # Can use either py*-pyqt4 or py*-pyqt4-devel.
    3132    depends_lib-append  port:py${python.version}-cython \
    3233                        port:py${python.version}-ipython \
     
    3435                        port:py${python.version}-mayavi \
    3536                        port:py${python.version}-numpy \
    36                         port:py${python.version}-pyqt4 \
     37                        path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \
    3738                        port:py${python.version}-scipy \
    3839                        port:vtk5
  • trunk/dports/python/py-spyder-devel/Portfile

    r113869 r114303  
    7878    }
    7979
     80    # Can use either py*-pyqt4 or py*-pyqt4-devel.
    8081    # Bare minimum
    8182    depends_lib-append  \
    82         port:py${python.version}-pyqt4 \
     83        path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \
    8384        port:py${python.version}-sphinx \
    8485        port:py${python.version}-zmq
  • trunk/dports/python/py-spyder/Portfile

    r112316 r114303  
    7777    }
    7878
     79    # Can use either py*-pyqt4 or py*-pyqt4-devel.
    7980    # Bare minimum
    8081    depends_lib-append  \
    81         port:py${python.version}-pyqt4
    82    
     82        path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4
     83
    8384    variant tiny description {
    8485        Remove all optional dependencies for quickest install. Dependencies\
  • trunk/dports/python/py-sunpy/Portfile

    r111684 r114303  
    3232    depends_build-append  port:py${python.version}-numpy
    3333
     34    # Can use either py*-pyqt4 or py*-pyqt4-devel.
    3435    depends_lib-append    port:py${python.version}-scipy \
    3536                          port:py${python.version}-matplotlib \
    3637                          port:py${python.version}-astropy \
    37                           port:py${python.version}-pyqt4 \
     38                          path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \
    3839                          port:py${python.version}-suds \
    3940                          port:py${python.version}-pandas \
  • trunk/dports/python/py-trep/Portfile

    r107400 r114303  
    3333if {$subport != $name} {
    3434    patchfiles      patch-setup.py.diff
     35
     36    # Can use either py*-pyqt4 or py*-pyqt4-devel.
    3537    depends_lib     port:py${python.version}-numpy \
    3638                    port:py${python.version}-scipy \
    3739                    port:py${python.version}-matplotlib \
    3840                    port:py${python.version}-opengl \
    39                     port:py${python.version}-pyqt4 \
     41                    path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \
    4042                    port:py${python.version}-sphinx
    4143    build.target-append build_sphinx
  • trunk/dports/python/py26-ete2/Portfile

    r106911 r114303  
    3333
    3434depends_build       port:py26-setuptools
     35
     36# Can use either py*-pyqt4 or py*-pyqt4-devel.
    3537depends_run         port:py26-mysql \
    3638                    port:py26-scipy \
    37                     port:py26-pyqt4
     39                    path:share/py26-sip/PyQt4:py26-pyqt4
    3840
    3941# py26-scipy is not universal
  • trunk/dports/science/gnuradio/Portfile

    r114249 r114303  
    322322
    323323                depends_lib-append \
    324                     path:share/qt4/plugins/designer/libpy${s}qt4.dylib:py${s}-pyqt4
     324                    path:share/py${s}-sip/PyQt4:py${s}-pyqt4
    325325
    326326                # pyqwt is not checked for at configure, but is
  • trunk/dports/science/ompl/Portfile

    r111530 r114303  
    106106            require_active_variants boost ${p}
    107107
    108             if { [variant_isset app] } {
    109                 depends_lib-append      port:py${s}-pyqt4 port:py${s}-opengl
     108            if { [variant_isset app] } { 
     109                # Can use either py*-pyqt4 or py*-pyqt4-devel.
     110                depends_lib-append \
     111                    path:share/py${s}-sip/PyQt4:py${s}-pyqt4 \
     112                    port:py${s}-opengl
    110113                post-destroot {
    111114                    reinplace "s|#!/usr/bin/env python|#!${prefix}/bin/python${v}|g" \
  • trunk/dports/science/plplot/Portfile

    r114134 r114303  
    291291
    292292variant py25_pyqt4 requires python25 description {Add support for pyQT4 using python25} {
    293     depends_lib-append     port:py25-pyqt4
     293    # Can use either py*-pyqt4 or py*-pyqt4-devel.
     294    depends_lib-append     path:share/py25-sip/PyQt4:py25-pyqt4
    294295    configure.args-delete   -DENABLE_pyqt4=OFF
    295296    configure.args-append   -DENABLE_pyqt4=ON
    296297}
    297298variant py26_pyqt4 requires python26 description {Add support for pyQT4 using python26} {
    298     depends_lib-append     port:py26-pyqt4
     299    # Can use either py*-pyqt4 or py*-pyqt4-devel.
     300    depends_lib-append     path:share/py26-sip/PyQt4:py26-pyqt4
    299301    configure.args-delete   -DENABLE_pyqt4=OFF
    300302    configure.args-append   -DENABLE_pyqt4=ON
    301303}
    302304variant py27_pyqt4 requires python27 description {Add support for pyQT4 using python27} {
    303     depends_lib-append     port:py27-pyqt4
     305    # Can use either py*-pyqt4 or py*-pyqt4-devel.
     306    depends_lib-append     path:share/py27-sip/PyQt4:py27-pyqt4
    304307    configure.args-delete   -DENABLE_pyqt4=OFF
    305308    configure.args-append   -DENABLE_pyqt4=ON
  • trunk/dports/sysutils/timedrive/Portfile

    r106911 r114303  
    1919
    2020platforms           darwin
     21
     22# Can use either py*-pyqt4 or py*-pyqt4-devel.
    2123depends_build-append \
    22                     port:py27-pyqt4 \
     24                    path:share/py27-sip/PyQt4:py27-pyqt4 \
    2325                    port:py27-sip \
    2426                    port:py27-setuptools
  • trunk/dports/www/linkchecker/Portfile

    r101002 r114303  
    3737python.default_version  27
    3838
    39 depends_lib-append  port:py27-pyqt4
     39# Can use either py*-pyqt4 or py*-pyqt4-devel.
     40depends_lib-append  path:share/py27-sip/PyQt4:py27-pyqt4
    4041
    4142pre-build {
Note: See TracChangeset for help on using the changeset viewer.