Revision: 118101 https://trac.macports.org/changeset/118101 Author: jmr@macports.org Date: 2014-03-22 08:16:34 -0700 (Sat, 22 Mar 2014) Log Message: ----------- remove replaced_by upgrade path for old python24-using py-* ports, as all were renamed to py24-* over a year ago now Modified Paths: -------------- trunk/dports/_resources/port1.0/group/python-1.0.tcl Modified: trunk/dports/_resources/port1.0/group/python-1.0.tcl =================================================================== --- trunk/dports/_resources/port1.0/group/python-1.0.tcl 2014-03-22 13:32:12 UTC (rev 118100) +++ trunk/dports/_resources/port1.0/group/python-1.0.tcl 2014-03-22 15:16:34 UTC (rev 118101) @@ -71,18 +71,14 @@ } proc python_get_default_version {} { global python.versions - # py-foo historically meant python24, so we default to that if present if {[info exists python.versions]} { - if {[lsearch -exact ${python.versions} 24] != -1} { - return 24 - } elseif {[lsearch -exact ${python.versions} 27] != -1} { - # this is the actual preferred version + if {[lsearch -exact ${python.versions} 27] != -1} { return 27 } else { return [lindex ${python.versions} end] } } else { - return 24 + return 27 } } @@ -101,11 +97,7 @@ checksum {} extract {} supported_archs noarch - global python.default_version - if {${python.default_version} == "24"} { - replaced_by py24[string trimleft $name py] - } - global python.version + global python.default_version python.version unset python.version depends_lib port:py${python.default_version}[string trimleft $name py] patch {} @@ -172,16 +164,6 @@ global name subport python.default_version if {[string match py-* $name]} { if {$subport eq $name || $subport eq ""} { - # Mark stub as replaced_by py24 subport if that's the - # default version, for backwards compatibility. If the - # default version isn't 24, clear replaced_by -- it might - # have already been set by python_set_versions. (But make - # sure we've set it first, or unset might complain.) - replaced_by py24[string trimleft $name py] - if {${python.default_version} != "24"} { - global replaced_by - unset replaced_by - } depends_lib port:py${python.default_version}[string trimleft $name py] } } else {