[136025] trunk/dports/graphics
larryv at macports.org
larryv at macports.org
Sat May 9 17:18:58 PDT 2015
Revision: 136025
https://trac.macports.org/changeset/136025
Author: larryv at macports.org
Date: 2015-05-09 17:18:58 -0700 (Sat, 09 May 2015)
Log Message:
-----------
graphviz{,-devel}: Remove `+python2[4-6]` variants (#46403)
Modified Paths:
--------------
trunk/dports/graphics/graphviz/Portfile
trunk/dports/graphics/graphviz-devel/Portfile
Modified: trunk/dports/graphics/graphviz/Portfile
===================================================================
--- trunk/dports/graphics/graphviz/Portfile 2015-05-10 00:05:36 UTC (rev 136024)
+++ trunk/dports/graphics/graphviz/Portfile 2015-05-10 00:18:58 UTC (rev 136025)
@@ -40,7 +40,7 @@
minimum_xcodeversions {9 3.1.2}
if {${name} eq ${subport}} {
-revision 0
+revision 1
conflicts graphviz${otherbranch}
@@ -178,45 +178,20 @@
}
}
-variant python24 description {Include Python 2.4 language bindings} conflicts python25 python26 {
- depends_lib-append port:python24
- depends_build-append port:swig-python
+# TODO: Remove after 2016-05-10.
+variant python24 description {Legacy variant} requires python27 {}
+variant python25 description {Legacy variant} requires python27 {}
+variant python26 description {Legacy variant} requires python27 {}
- configure.args-replace --disable-swig --enable-swig
- configure.args-replace --disable-python --enable-python
- configure.python ${prefix}/bin/python2.4
-
- # The configure script asks python where to install
- # This doesn't work for 2.4 and 2.5 (see #16334)
- post-patch {
- reinplace "s|PYTHON_INSTALL_DIR=.*|PYTHON_INSTALL_DIR=${prefix}/lib/python2.4|" ${worksrcpath}/configure
- }
-}
-
-variant python25 description {Include Python 2.5 language bindings} conflicts python24 python26 {
- depends_lib-append port:python25
+variant python27 description {Include Python 2.7 language bindings} {
+ depends_lib-append port:python27
depends_build-append port:swig-python
configure.args-replace --disable-swig --enable-swig
configure.args-replace --disable-python --enable-python
- configure.python ${prefix}/bin/python2.5
-
- # The configure script asks python where to install
- # This doesn't work for 2.4 and 2.5 (see #16334)
- post-patch {
- reinplace "s|PYTHON_INSTALL_DIR=.*|PYTHON_INSTALL_DIR=${prefix}/lib/python2.5|" ${worksrcpath}/configure
- }
+ configure.python ${prefix}/bin/python2.7
}
-variant python26 description {Include Python 2.6 language bindings} conflicts python24 python25 {
- depends_lib-append port:python26
- depends_build-append port:swig-python
-
- configure.args-replace --disable-swig --enable-swig
- configure.args-replace --disable-python --enable-python
- configure.python ${prefix}/bin/python2.6
-}
-
variant ruby description {Include Ruby language bindings} {
depends_lib-append port:ruby
depends_build-append port:swig-ruby
Modified: trunk/dports/graphics/graphviz-devel/Portfile
===================================================================
--- trunk/dports/graphics/graphviz-devel/Portfile 2015-05-10 00:05:36 UTC (rev 136024)
+++ trunk/dports/graphics/graphviz-devel/Portfile 2015-05-10 00:18:58 UTC (rev 136025)
@@ -40,7 +40,7 @@
minimum_xcodeversions {9 3.1.2}
if {${name} eq ${subport}} {
-revision 0
+revision 1
conflicts graphviz${otherbranch}
@@ -178,45 +178,20 @@
}
}
-variant python24 description {Include Python 2.4 language bindings} conflicts python25 python26 {
- depends_lib-append port:python24
- depends_build-append port:swig-python
+# TODO: Remove after 2016-05-10.
+variant python24 description {Legacy variant} requires python27 {}
+variant python25 description {Legacy variant} requires python27 {}
+variant python26 description {Legacy variant} requires python27 {}
- configure.args-replace --disable-swig --enable-swig
- configure.args-replace --disable-python --enable-python
- configure.python ${prefix}/bin/python2.4
-
- # The configure script asks python where to install
- # This doesn't work for 2.4 and 2.5 (see #16334)
- post-patch {
- reinplace "s|PYTHON_INSTALL_DIR=.*|PYTHON_INSTALL_DIR=${prefix}/lib/python2.4|" ${worksrcpath}/configure
- }
-}
-
-variant python25 description {Include Python 2.5 language bindings} conflicts python24 python26 {
- depends_lib-append port:python25
+variant python27 description {Include Python 2.7 language bindings} {
+ depends_lib-append port:python27
depends_build-append port:swig-python
configure.args-replace --disable-swig --enable-swig
configure.args-replace --disable-python --enable-python
- configure.python ${prefix}/bin/python2.5
-
- # The configure script asks python where to install
- # This doesn't work for 2.4 and 2.5 (see #16334)
- post-patch {
- reinplace "s|PYTHON_INSTALL_DIR=.*|PYTHON_INSTALL_DIR=${prefix}/lib/python2.5|" ${worksrcpath}/configure
- }
+ configure.python ${prefix}/bin/python2.7
}
-variant python26 description {Include Python 2.6 language bindings} conflicts python24 python25 {
- depends_lib-append port:python26
- depends_build-append port:swig-python
-
- configure.args-replace --disable-swig --enable-swig
- configure.args-replace --disable-python --enable-python
- configure.python ${prefix}/bin/python2.6
-}
-
variant ruby description {Include Ruby language bindings} {
depends_lib-append port:ruby
depends_build-append port:swig-ruby
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150509/975533d8/attachment.html>
More information about the macports-changes
mailing list