[48236] branches/release_1_7

[blb at macports.org]

Revision: 48236
          http://trac.macports.org/changeset/48236
Author:   blb at macports.org
Date:     2009-03-17 01:51:43 -0700 (Tue, 17 Mar 2009)
Log Message:
-----------
Merge r46918 from trunk: portfetch.tcl, portextract.tcl: Add new "use_7z" option to allow use of .7z-compressed distfiles; see #18521

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

Property Changed:
----------------
    branches/release_1_7/
    branches/release_1_7/base/


Property changes on: branches/release_1_7
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43902,43946,43954,43960,44363,45161,45201,46052,46146,46780,46983,47034,47776,47782,48230
/trunk/base:45161
   + /trunk:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43902,43946,43954,43960,44363,45161,45201,46052,46146,46780,46918,46983,47034,47776,47782,48230
/trunk/base:45161


Property changes on: branches/release_1_7/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/base:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43902,43946,43954,43960,44363,45161,45201,46052,46146,46622-46623,46780,46810,46983,47034,47776,47782,47848,48083,48230
/trunk/base/base:45161,48083
   + /trunk/base:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43902,43946,43954,43960,44363,45161,45201,46052,46146,46622-46623,46780,46810,46918,46983,47034,47776,47782,47848,48083,48230
/trunk/base/base:45161,48083

Modified: branches/release_1_7/base/src/port1.0/portextract.tcl
===================================================================
--- branches/release_1_7/base/src/port1.0/portextract.tcl	2009-03-17 08:44:15 UTC (rev 48235)
+++ branches/release_1_7/base/src/port1.0/portextract.tcl	2009-03-17 08:51:43 UTC (rev 48236)
@@ -58,7 +58,7 @@
 set_ui_prefix
 
 proc extract_init {args} {
-    global extract.only extract.dir extract.cmd extract.pre_args extract.post_args extract.mkdir distfiles use_bzip2 use_lzma use_zip use_dmg workpath
+    global extract.only extract.dir extract.cmd extract.pre_args extract.post_args extract.mkdir distfiles use_bzip2 use_lzma use_zip use_7z use_dmg workpath
 
     # should the distfiles be extracted to worksrcpath instead?
     if {[tbool extract.mkdir]} {
@@ -76,6 +76,10 @@
 	option extract.cmd [binaryInPath "unzip"]
 	option extract.pre_args -q
 	option extract.post_args "-d [option extract.dir]"
+    } elseif {[tbool use_7z]} {
+        option extract.cmd [binaryInPath "7za"]
+        option extract.pre_args x
+        option extract.post_args ""
     } elseif {[tbool use_dmg]} {
         global worksrcdir
         set dmg_tmp_dir [exec mktemp -d -q "/tmp/mports.XXXXXXXX"]

Modified: branches/release_1_7/base/src/port1.0/portfetch.tcl
===================================================================
--- branches/release_1_7/base/src/port1.0/portfetch.tcl	2009-03-17 08:44:15 UTC (rev 48235)
+++ branches/release_1_7/base/src/port1.0/portfetch.tcl	2009-03-17 08:51:43 UTC (rev 48236)
@@ -41,7 +41,7 @@
 target_prerun ${org.macports.fetch} fetch_start
 
 # define options: distname master_sites
-options master_sites patch_sites extract.suffix distfiles patchfiles use_zip use_bzip2 use_lzma use_dmg dist_subdir \
+options master_sites patch_sites extract.suffix distfiles patchfiles use_zip use_bzip2 use_lzma use_7z use_dmg dist_subdir \
 	fetch.type fetch.user fetch.password fetch.use_epsv fetch.ignore_sslcert \
 	master_sites.mirror_subdir patch_sites.mirror_subdir portname \
 	cvs.module cvs.root cvs.password cvs.date cvs.tag \
@@ -106,6 +106,7 @@
 option_proc use_bzip2 fix_extract_suffix
 option_proc use_lzma fix_extract_suffix
 option_proc use_zip fix_extract_suffix
+option_proc use_7z fix_extract_suffix
 option_proc use_dmg fix_extract_suffix
 
 proc fix_extract_suffix {option action args} {
@@ -121,6 +122,9 @@
             use_zip {
                 set extract.suffix .zip
             }
+            use_7z {
+                set extract.suffix .7z
+            }
             use_dmg {
                 set extract.suffix .dmg
             }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090317/7cc159f1/attachment-0001.html>