Revision

130444

Author

larryv@macports.org

Date

2014-12-30 16:34:58 -0800 (Tue, 30 Dec 2014)

Log Message

nodejs{,-devel}: Retire Python 2.5 variant (#46340)

Modified Paths

• trunk/dports/devel/nodejs/Portfile
• trunk/dports/devel/nodejs-devel/Portfile

Diff

--- trunk/dports/devel/nodejs/Portfile	2014-12-31 00:20:03 UTC (rev 130443)
+++ trunk/dports/devel/nodejs/Portfile	2014-12-31 00:34:58 UTC (rev 130444)
@@ -6,6 +6,7 @@
 
 name                    nodejs
 version                 0.10.35
+revision                1
 
 categories              devel net
 platforms               darwin
@@ -64,17 +65,15 @@
 configure.args          --without-ssl
 configure.args-append   --without-npm
 
-variant python25 conflicts python26 python27 description {Use python 2.5} {
-    depends_lib-append  port:python25
-    configure.python    ${prefix}/bin/python2.5
-}
+# TODO: Remove after 2015-12-27.
+variant python25 requires python27 description {Legacy variant} {}
 
-variant python26 conflicts python25 python27 description {Use python 2.6} {
+variant python26 conflicts python27 description {Use python 2.6} {
     depends_lib-append  port:python26
     configure.python    ${prefix}/bin/python2.6
 }
 
-variant python27 conflicts python25 python26 description {Use python 2.7} {
+variant python27 conflicts python26 description {Use python 2.7} {
     depends_lib-append  port:python27
     configure.python    ${prefix}/bin/python2.7
 }

--- trunk/dports/devel/nodejs-devel/Portfile	2014-12-31 00:20:03 UTC (rev 130443)
+++ trunk/dports/devel/nodejs-devel/Portfile	2014-12-31 00:34:58 UTC (rev 130444)
@@ -6,7 +6,7 @@
 
 name                    nodejs-devel
 version                 0.11.14
-revision                1
+revision                2
 categories              devel net
 platforms               darwin
 license                 {MIT BSD}
@@ -57,17 +57,15 @@
 configure.args          --without-ssl
 configure.args-append   --without-npm
 
-variant python25 conflicts python26 python27 description {Use python 2.5} {
-    depends_lib-append  port:python25
-    configure.python    ${prefix}/bin/python2.5
-}
+# TODO: Remove after 2015-12-27.
+variant python25 requires python27 description {Legacy variant} {}
 
-variant python26 conflicts python25 python27 description {Use python 2.6} {
+variant python26 conflicts python27 description {Use python 2.6} {
     depends_lib-append  port:python26
     configure.python    ${prefix}/bin/python2.6
 }
 
-variant python27 conflicts python25 python26 description {Use python 2.7} {
+variant python27 conflicts python26 description {Use python 2.7} {
     depends_lib-append  port:python27
     configure.python    ${prefix}/bin/python2.7
 }