[81270] branches/release_2_0/base

[afb at macports.org]

Revision: 81270
          http://trac.macports.org/changeset/81270
Author:   afb at macports.org
Date:     2011-07-28 07:36:18 -0700 (Thu, 28 Jul 2011)
Log Message:
-----------
merge r81269 from trunk:
 use lzma_path and xz_path

Revision Links:
--------------
    http://trac.macports.org/changeset/81269

Modified Paths:
--------------
    branches/release_2_0/base/src/port1.0/portextract.tcl

Property Changed:
----------------
    branches/release_2_0/base/


Property changes on: branches/release_2_0/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79771-79774,79782,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81171
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79771-79774,79782,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81171,81269
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_2_0/base/src/port1.0/portextract.tcl
===================================================================
--- branches/release_2_0/base/src/port1.0/portextract.tcl	2011-07-28 14:33:21 UTC (rev 81269)
+++ branches/release_2_0/base/src/port1.0/portextract.tcl	2011-07-28 14:36:18 UTC (rev 81270)
@@ -92,9 +92,9 @@
     if {[tbool use_bzip2]} {
         option extract.cmd [findBinary bzip2 ${portutil::autoconf::bzip2_path}]
     } elseif {[tbool use_lzma]} {
-        option extract.cmd [binaryInPath "lzma"]
+        option extract.cmd [findBinary lzma ${portutil::autoconf::lzma_path}]
     } elseif {[tbool use_xz]} {
-        option extract.cmd [binaryInPath "xz"]
+        option extract.cmd [findBinary xz ${portutil::autoconf::xz_path}]
     } elseif {[tbool use_zip]} {
         option extract.cmd [findBinary unzip ${portutil::autoconf::unzip_path}]
         option extract.pre_args -q
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110728/e6f3829e/attachment.html>