[22585] trunk/base

[source_changes at macosforge.org]

Revision: 22585
          http://trac.macosforge.org/projects/macports/changeset/22585
Author:   jmpp at macports.org
Date:     2007-03-05 08:29:09 -0800 (Mon, 05 Mar 2007)

Log Message:
-----------

Merged r22584 back from release_1-4 branch: Archivemode now recognizes both tbz2 & tbz binary archives,
the former being a much more common naming variation than the latter, which is kept for backwards compatibility.

PS: Forgot to say in my original commit that the changes have been confirmed to work on my local 1.4 installation.

Modified Paths:
--------------
    trunk/base/doc/ports.conf.5
    trunk/base/doc/ports.conf.in
    trunk/base/src/package1.0/portarchive.tcl

Modified: trunk/base/doc/ports.conf.5
===================================================================
--- trunk/base/doc/ports.conf.5	2007-03-05 16:21:38 UTC (rev 22584)
+++ trunk/base/doc/ports.conf.5	2007-03-05 16:29:09 UTC (rev 22585)
@@ -116,7 +116,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, xar, zip, cpgz, cpio
+Supported types are: tgz, tar, tbz, tbz2, xar, zip, cpgz, cpio
 .br
 .Ic Default:
 tgz

Modified: trunk/base/doc/ports.conf.in
===================================================================
--- trunk/base/doc/ports.conf.in	2007-03-05 16:21:38 UTC (rev 22584)
+++ trunk/base/doc/ports.conf.in	2007-03-05 16:29:09 UTC (rev 22585)
@@ -34,7 +34,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, xar, zip, cpgz, cpio
+# Supported types: tgz (default), tar, tbz, tbz2, xar, zip, cpgz, cpio
 portarchivetype		tgz
 
 # Set whether to automatically execute "clean" after "install" of ports

Modified: trunk/base/src/package1.0/portarchive.tcl
===================================================================
--- trunk/base/src/package1.0/portarchive.tcl	2007-03-05 16:21:38 UTC (rev 22584)
+++ trunk/base/src/package1.0/portarchive.tcl	2007-03-05 16:29:09 UTC (rev 22585)
@@ -175,8 +175,8 @@
 				ui_debug "Using $tar"
 				set archive.cmd "$tar"
 				set archive.pre_args {-cvf}
-				if {[regexp {z$} ${archive.type}]} {
-					if {[regexp {bz$} ${archive.type}]} {
+				if {[regexp {z2?$} ${archive.type}]} {
+					if {[regexp {bz2?$} ${archive.type}]} {
 						set gzip "bzip2"
 					} else {
 						set gzip "gzip"

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