[46918] trunk/base/src/port1.0

[ryandesign at macports.org]

Revision: 46918
          http://trac.macports.org/changeset/46918
Author:   ryandesign at macports.org
Date:     2009-02-16 22:11:22 -0800 (Mon, 16 Feb 2009)
Log Message:
-----------
portfetch.tcl, portextract.tcl: Add new "use_7z" option to allow use of .7z-compressed distfiles; see #18521

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

Modified: trunk/base/src/port1.0/portextract.tcl
===================================================================
--- trunk/base/src/port1.0/portextract.tcl	2009-02-17 05:49:21 UTC (rev 46917)
+++ trunk/base/src/port1.0/portextract.tcl	2009-02-17 06:11:22 UTC (rev 46918)
@@ -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: trunk/base/src/port1.0/portfetch.tcl
===================================================================
--- trunk/base/src/port1.0/portfetch.tcl	2009-02-17 05:49:21 UTC (rev 46917)
+++ trunk/base/src/port1.0/portfetch.tcl	2009-02-17 06:11:22 UTC (rev 46918)
@@ -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 cvs.method \
@@ -108,6 +108,7 @@
 option_proc use_bzip2 set_extract_type
 option_proc use_lzma set_extract_type
 option_proc use_zip set_extract_type
+option_proc use_7z set_extract_type
 option_proc use_dmg set_extract_type
 
 option_proc fetch.type set_fetch_type
@@ -128,6 +129,10 @@
                 set extract.suffix .zip
                 depends_build-append bin:unzip:unzip
             }
+            use_7z {
+                set extract.suffix .7z
+                depends_build-append bin:7za:p7zip
+            }
             use_dmg {
                 set extract.suffix .dmg
             }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090216/0f6517d9/attachment-0001.html>