Ticket #46403: graphviz.python.patch

File graphviz.python.patch, 5.4 KB (added by larryv (Lawrence Velázquez), 9 years ago)

  • dports/graphics/graphviz-devel/Portfile 

    diff --git a/dports/graphics/graphviz-devel/Portfile b/dports/graphics/graphviz-devel/Portfile
index 0700a7d..a5d2469 100644
    a b checksums rmd160 4bfcc2f9c85920a54c2eb4d21345440c9a54bf44 
    4040minimum_xcodeversions           {9 3.1.2}
    4141
    4242if {${name} eq ${subport}} {
    43 revision                        0
     43revision                        1
    4444
    4545conflicts                       graphviz${otherbranch}
    4646
    … … variant php description {Include PHP language bindings} { 
    178178    }
    179179}
    180180
    181 variant python24 description {Include Python 2.4 language bindings} conflicts python25 python26 {
    182     depends_lib-append          port:python24
    183     depends_build-append        port:swig-python
    184 
    185     configure.args-replace      --disable-swig --enable-swig
    186     configure.args-replace      --disable-python --enable-python
    187     configure.python            ${prefix}/bin/python2.4
    188 
    189     # The configure script asks python where to install
    190     # This doesn't work for 2.4 and 2.5 (see #16334)
    191     post-patch {
    192         reinplace "s|PYTHON_INSTALL_DIR=.*|PYTHON_INSTALL_DIR=${prefix}/lib/python2.4|" ${worksrcpath}/configure
    193     }
    194 }
    195 
    196 variant python25 description {Include Python 2.5 language bindings} conflicts python24 python26 {
    197     depends_lib-append          port:python25
    198     depends_build-append        port:swig-python
    199 
    200     configure.args-replace      --disable-swig --enable-swig
    201     configure.args-replace      --disable-python --enable-python
    202     configure.python            ${prefix}/bin/python2.5
    203 
    204     # The configure script asks python where to install
    205     # This doesn't work for 2.4 and 2.5 (see #16334)
    206     post-patch {
    207         reinplace "s|PYTHON_INSTALL_DIR=.*|PYTHON_INSTALL_DIR=${prefix}/lib/python2.5|" ${worksrcpath}/configure
    208     }
    209 }
     181# TODO: Remove after 2016-01-04.
     182variant python24 description {Legacy variant} requires python27 {}
     183variant python25 description {Legacy variant} requires python27 {}
     184variant python26 description {Legacy variant} requires python27 {}
    210185
    211 variant python26 description {Include Python 2.6 language bindings} conflicts python24 python25 {
    212     depends_lib-append          port:python26
     186variant python27 description {Include Python 2.7 language bindings} {
     187    depends_lib-append          port:python27
    213188    depends_build-append        port:swig-python
    214189
    215190    configure.args-replace      --disable-swig --enable-swig
    216191    configure.args-replace      --disable-python --enable-python
    217     configure.python            ${prefix}/bin/python2.6
     192    configure.python            ${prefix}/bin/python2.7
    218193}
    219194
    220195variant ruby description {Include Ruby language bindings} {

  • dports/graphics/graphviz/Portfile 

    diff --git a/dports/graphics/graphviz/Portfile b/dports/graphics/graphviz/Portfile
index 539928b..c212d89 100644
    a b checksums rmd160 a80c2fa6b9955444b2103a99167d7020b23e4c4e 
    4040minimum_xcodeversions           {9 3.1.2}
    4141
    4242if {${name} eq ${subport}} {
    43 revision                        0
     43revision                        1
    4444
    4545conflicts                       graphviz${otherbranch}
    4646
    … … variant php description {Include PHP language bindings} { 
    178178    }
    179179}
    180180
    181 variant python24 description {Include Python 2.4 language bindings} conflicts python25 python26 {
    182     depends_lib-append          port:python24
    183     depends_build-append        port:swig-python
    184 
    185     configure.args-replace      --disable-swig --enable-swig
    186     configure.args-replace      --disable-python --enable-python
    187     configure.python            ${prefix}/bin/python2.4
    188 
    189     # The configure script asks python where to install
    190     # This doesn't work for 2.4 and 2.5 (see #16334)
    191     post-patch {
    192         reinplace "s|PYTHON_INSTALL_DIR=.*|PYTHON_INSTALL_DIR=${prefix}/lib/python2.4|" ${worksrcpath}/configure
    193     }
    194 }
    195 
    196 variant python25 description {Include Python 2.5 language bindings} conflicts python24 python26 {
    197     depends_lib-append          port:python25
    198     depends_build-append        port:swig-python
    199 
    200     configure.args-replace      --disable-swig --enable-swig
    201     configure.args-replace      --disable-python --enable-python
    202     configure.python            ${prefix}/bin/python2.5
    203 
    204     # The configure script asks python where to install
    205     # This doesn't work for 2.4 and 2.5 (see #16334)
    206     post-patch {
    207         reinplace "s|PYTHON_INSTALL_DIR=.*|PYTHON_INSTALL_DIR=${prefix}/lib/python2.5|" ${worksrcpath}/configure
    208     }
    209 }
     181# TODO: Remove after 2016-01-04.
     182variant python24 description {Legacy variant} requires python27 {}
     183variant python25 description {Legacy variant} requires python27 {}
     184variant python26 description {Legacy variant} requires python27 {}
    210185
    211 variant python26 description {Include Python 2.6 language bindings} conflicts python24 python25 {
    212     depends_lib-append          port:python26
     186variant python27 description {Include Python 2.7 language bindings} {
     187    depends_lib-append          port:python27
    213188    depends_build-append        port:swig-python
    214189
    215190    configure.args-replace      --disable-swig --enable-swig
    216191    configure.args-replace      --disable-python --enable-python
    217     configure.python            ${prefix}/bin/python2.6
     192    configure.python            ${prefix}/bin/python2.7
    218193}
    219194
    220195variant ruby description {Include Ruby language bindings} {