[51232] trunk/base

[afb at macports.org]

Revision: 51232
          http://trac.macports.org/changeset/51232
Author:   afb at macports.org
Date:     2009-05-21 03:31:22 -0700 (Thu, 21 May 2009)
Log Message:
-----------
add support for .txz archive format (see port xz-devel)

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	2009-05-21 10:23:51 UTC (rev 51231)
+++ trunk/base/doc/macports.conf.5	2009-05-21 10:31:22 UTC (rev 51232)
@@ -127,7 +127,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, tlz, xar, zip, cpgz, cpio
+Supported types are: tgz, tar, tbz, tbz2, tlz, txz, xar, zip, cpgz, cpio
 .br
 .Ic Default:
 tgz

Modified: trunk/base/doc/macports.conf.in
===================================================================
--- trunk/base/doc/macports.conf.in	2009-05-21 10:23:51 UTC (rev 51231)
+++ trunk/base/doc/macports.conf.in	2009-05-21 10:31:22 UTC (rev 51232)
@@ -47,7 +47,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, tlz, xar, zip, cpgz, cpio
+# Supported types: tgz (default), tar, tbz, tbz2, tlz, txz, 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	2009-05-21 10:23:51 UTC (rev 51231)
+++ trunk/base/src/package1.0/portarchive.tcl	2009-05-21 10:31:22 UTC (rev 51232)
@@ -192,7 +192,7 @@
 				return -code error "No '$pax' was found on this system!"
 			}
 		}
-		t(ar|bz|lz|gz) {
+		t(ar|bz|lz|xz|gz) {
 			set tar "tar"
 			if {[catch {set tar [findBinary $tar ${portutil::autoconf::tar_path}]} errmsg] == 0} {
 				ui_debug "Using $tar"
@@ -205,6 +205,9 @@
 					} elseif {[regexp {lz$} ${archive.type}]} {
 						set gzip "lzma"
 						set level 7
+					} elseif {[regexp {xz$} ${archive.type}]} {
+						set gzip "xz"
+						set level 6
 					} else {
 						set gzip "gzip"
 						set level 9

Modified: trunk/base/src/package1.0/portunarchive.tcl
===================================================================
--- trunk/base/src/package1.0/portunarchive.tcl	2009-05-21 10:23:51 UTC (rev 51231)
+++ trunk/base/src/package1.0/portunarchive.tcl	2009-05-21 10:31:22 UTC (rev 51232)
@@ -196,7 +196,7 @@
 				return -code error "No '$pax' was found on this system!"
 			}
 		}
-		t(ar|bz|lz|gz) {
+		t(ar|bz|lz|xz|gz) {
 			set tar "tar"
 			if {[catch {set tar [findBinary $tar ${portutil::autoconf::tar_path}]} errmsg] == 0} {
 				ui_debug "Using $tar"
@@ -208,6 +208,8 @@
 						set gzip "bzip2"
 					} elseif {[regexp {lz$} ${unarchive.type}]} {
 						set gzip "lzma"
+					} elseif {[regexp {xz$} ${unarchive.type}]} {
+						set gzip "xz"
 					} else {
 						set gzip "gzip"
 					}

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2009-05-21 10:23:51 UTC (rev 51231)
+++ trunk/base/src/port1.0/portutil.tcl	2009-05-21 10:31:22 UTC (rev 51232)
@@ -2245,7 +2245,7 @@
                 }
             }
         }
-        t(ar|bz|lz|gz) {
+        t(ar|bz|lz|xz|gz) {
             set tar "tar"
             if {[catch {set tar [findBinary $tar ${portutil::autoconf::tar_path}]} errmsg] == 0} {
                 if {[regexp {z2?$} $type]} {
@@ -2253,6 +2253,8 @@
                         set gzip "bzip2"
                     } elseif {[regexp {lz$} $type]} {
                         set gzip "lzma"
+                    } elseif {[regexp {xz$} $type]} {
+                        set gzip "xz"
                     } else {
                         set gzip "gzip"
                     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090521/efe9280b/attachment.html>