Ticket #46340: nodejs-python.patch

File nodejs-python.patch, 2.6 KB (added by larryv (Lawrence Velázquez), 10 years ago)

  • dports/devel/nodejs-devel/Portfile 

    diff --git a/dports/devel/nodejs-devel/Portfile b/dports/devel/nodejs-devel/Portfile
index 5b64f0a..b1abd31 100644
    a b PortGroup compiler_blacklist_versions 1.0 
    66
    77name                    nodejs-devel
    88version                 0.11.14
    9 revision                1
     9revision                2
    1010categories              devel net
    1111platforms               darwin
    1212license                 {MIT BSD}
    … … post-patch { 
    5757configure.args          --without-ssl
    5858configure.args-append   --without-npm
    5959
    60 variant python25 conflicts python26 python27 description {Use python 2.5} {
    61     depends_lib-append  port:python25
    62     configure.python    ${prefix}/bin/python2.5
    63 }
     60# TODO: Remove after 2015-12-27.
     61variant python25 requires python27 description {Legacy variant} {}
    6462
    65 variant python26 conflicts python25 python27 description {Use python 2.6} {
     63variant python26 conflicts python27 description {Use python 2.6} {
    6664    depends_lib-append  port:python26
    6765    configure.python    ${prefix}/bin/python2.6
    6866}
    6967
    70 variant python27 conflicts python25 python26 description {Use python 2.7} {
     68variant python27 conflicts python26 description {Use python 2.7} {
    7169    depends_lib-append  port:python27
    7270    configure.python    ${prefix}/bin/python2.7
    7371}

  • dports/devel/nodejs/Portfile 

    diff --git a/dports/devel/nodejs/Portfile b/dports/devel/nodejs/Portfile
index e074dc7..7c0f3f4 100644
    a b PortGroup compiler_blacklist_versions 1.0 
    66
    77name                    nodejs
    88version                 0.10.35
     9revision                1
    910
    1011categories              devel net
    1112platforms               darwin
    … … post-patch { 
    6465configure.args          --without-ssl
    6566configure.args-append   --without-npm
    6667
    67 variant python25 conflicts python26 python27 description {Use python 2.5} {
    68     depends_lib-append  port:python25
    69     configure.python    ${prefix}/bin/python2.5
    70 }
     68# TODO: Remove after 2015-12-27.
     69variant python25 requires python27 description {Legacy variant} {}
    7170
    72 variant python26 conflicts python25 python27 description {Use python 2.6} {
     71variant python26 conflicts python27 description {Use python 2.6} {
    7372    depends_lib-append  port:python26
    7473    configure.python    ${prefix}/bin/python2.6
    7574}
    7675
    77 variant python27 conflicts python25 python26 description {Use python 2.7} {
     76variant python27 conflicts python26 description {Use python 2.7} {
    7877    depends_lib-append  port:python27
    7978    configure.python    ${prefix}/bin/python2.7
    8079}