[30307] trunk/base

[source_changes at macosforge.org]

Revision: 30307
          http://trac.macosforge.org/projects/macports/changeset/30307
Author:   afb at macports.org
Date:     2007-10-24 03:20:57 -0700 (Wed, 24 Oct 2007)

Log Message:
-----------
support lzma compression for archives

Modified Paths:
--------------
    trunk/base/doc/macports.conf.5
    trunk/base/doc/macports.conf.in
    trunk/base/src/package1.0/portarchive.tcl
    trunk/base/src/package1.0/portunarchive.tcl
    trunk/base/src/port1.0/portutil.tcl

Modified: trunk/base/doc/macports.conf.5
===================================================================
--- trunk/base/doc/macports.conf.5	2007-10-24 09:07:21 UTC (rev 30306)
+++ trunk/base/doc/macports.conf.5	2007-10-24 10:20:57 UTC (rev 30307)
@@ -117,7 +117,7 @@
 specified types in one step. Unarchive uses multiple types as a search list to locate any existing archive,
 with the first found match being used.
 .br
-Supported types are: tgz, tar, tbz, tbz2, xar, zip, cpgz, cpio
+Supported types are: tgz, tar, tbz, tbz2, tlz, xar, zip, cpgz, cpio
 .br
 .Ic Default:
 tgz

Modified: trunk/base/doc/macports.conf.in
===================================================================
--- trunk/base/doc/macports.conf.in	2007-10-24 09:07:21 UTC (rev 30306)
+++ trunk/base/doc/macports.conf.in	2007-10-24 10:20:57 UTC (rev 30307)
@@ -37,7 +37,7 @@
 # Unarchive uses multiple types as a search list to locate the archive,
 # first archive to match one of the specified types in order is used.
 #
-# Supported types: tgz (default), tar, tbz, tbz2, xar, zip, cpgz, cpio
+# Supported types: tgz (default), tar, tbz, tbz2, tlz, xar, zip, cpgz, cpio
 portarchivetype		tgz
 
 # Use ccache (C/C++ compiler cache) - see http://ccache.samba.org/

Modified: trunk/base/src/package1.0/portarchive.tcl
===================================================================
--- trunk/base/src/package1.0/portarchive.tcl	2007-10-24 09:07:21 UTC (rev 30306)
+++ trunk/base/src/package1.0/portarchive.tcl	2007-10-24 10:20:57 UTC (rev 30307)
@@ -169,7 +169,7 @@
 				return -code error "No '$pax' was found on this system!"
 			}
 		}
-		t(ar|bz|gz) {
+		t(ar|bz|lz|gz) {
 			set tar "tar"
 			if {[catch {set tar [binaryInPath $tar]} errmsg] == 0} {
 				ui_debug "Using $tar"
@@ -178,6 +178,8 @@
 				if {[regexp {z2?$} ${archive.type}]} {
 					if {[regexp {bz2?$} ${archive.type}]} {
 						set gzip "bzip2"
+					} elseif {[regexp {lz$} ${archive.type}]} {
+						set gzip "lzma"
 					} else {
 						set gzip "gzip"
 					}

Modified: trunk/base/src/package1.0/portunarchive.tcl
===================================================================
--- trunk/base/src/package1.0/portunarchive.tcl	2007-10-24 09:07:21 UTC (rev 30306)
+++ trunk/base/src/package1.0/portunarchive.tcl	2007-10-24 10:20:57 UTC (rev 30307)
@@ -191,7 +191,7 @@
 				return -code error "No '$pax' was found on this system!"
 			}
 		}
-		t(ar|bz|gz) {
+		t(ar|bz|lz|gz) {
 			set tar "tar"
 			if {[catch {set tar [binaryInPath $tar]} errmsg] == 0} {
 				ui_debug "Using $tar"
@@ -201,6 +201,8 @@
 					set unarchive.args {-}
 					if {[regexp {bz2?$} ${unarchive.type}]} {
 						set gzip "bzip2"
+					} elseif {[regexp {lz$} ${unarchive.type}]} {
+						set gzip "lzma"
 					} else {
 						set gzip "gzip"
 					}

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2007-10-24 09:07:21 UTC (rev 30306)
+++ trunk/base/src/port1.0/portutil.tcl	2007-10-24 10:20:57 UTC (rev 30307)
@@ -1903,12 +1903,14 @@
 				}
 			}
 		}
-		t(ar|bz|gz) {
+		t(ar|bz|lz|gz) {
 			set tar "tar"
 			if {[catch {set tar [binaryInPath $tar]} errmsg] == 0} {
 				if {[regexp {z2?$} $type]} {
 					if {[regexp {bz2?$} $type]} {
 						set gzip "bzip2"
+					} elseif {[regexp {lz$} $type]} {
+						set gzip "lzma"
 					} else {
 						set gzip "gzip"
 					}

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071024/eedb776e/attachment.html