Update to 1.22:

version 1.22 - Sergey Poznyakoff, 2009-03-05

* Support for xz compression

Tar uses xz for compression if one of the following conditions is met:

 1. The option --xz or -J (see below) is used.
 2. The xz binary is set as compressor using --use-compress-program option.
 3. The file name of the archive being created ends in `.xz' and
 auto-compress option (-a) is used.

Xz is used for decompression if one of the following conditions is met:

 1. The option --xz or -J is used.
 2. The xz binary is set as compressor using --use-compress-program option.
 3. The file is recognized as xz compressed stream data.

* Short option -J reassigned as a short equivalent of --xz

* New option -I

The -I option is assigned as a short equivalent for
--use-compress-program.

* The --no-recursive option works in incremental mode.


version 1.21 - Sergey Poznyakoff, 2008-12-27

* New short option -J

A shortcut for --lzma.

* New option --lzop

* New option --no-auto-compress

Cancels the effect of previous --auto-compress (-a) option.

* New option --no-null

Cancels the effect of previous --null option.

* Compressed format recognition

If tar is unable to determine archive compression format, it falls
back to using archive suffix to determine it.

* VCS support.

Using --exclude-vcs handles also files used internally by Bazaar,
Mercurial and Darcs.

* Transformation scope flags

Name transformation expressions understand additional flags that
control type of archive members affected by them.  The flags are:

 - r
   Apply transformation to regular archive members.

 - s
   Apply transformation to symbolic link targets.

 - h
   Apply transformation to hard link targets.

Corresponding upper-case letters negate the meaning, so that
`H' means ``do not apply transformation to hard link targets.''

The scope flags are listed in the third part of an `s' expression,
e.g.:

   tar --transform 's|^|/usr/local/|S'

Default is `rsh', which means that transformations are applied to
both regular archive members and to the targets of symbolic and hard
links.  If several transform expressions are used, the default flags
can be changed using `flags=' statement before the expressions, e.g.:

   tar --transform 'flags=S;s|^|/usr/local/|S'

* Bugfixes

** The --null option disabled handling of tar options in list files.  This
is fixed.
** Fixed record size autodetection.  If detected record size differs from
the expected value (either default, or set on the command line), tar
always prints a warning if verbosity level is set to 1 or greater,
i.e. if either -t or -v option is given.

7 files changed, 26 insertions, 36 deletions

diff --git a/archivers/gtar-base/Makefile b/archivers/gtar-base/Makefile
index 228afdf1c0b..2c0f6df7dd2 100644
--- a/archivers/gtar-base/Makefile
+++ b/archivers/gtar-base/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2008/05/18 01:48:09 tnn Exp $
+# $NetBSD: Makefile,v 1.64 2009/08/16 13:53:32 wiz Exp $
 
-DISTNAME=	tar-1.20
-PKGNAME=	gtar-base-1.20
+DISTNAME=	tar-1.22
+PKGNAME=	gtar-base-1.22
 SVR4_PKGNAME=	gtarb
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_GNU:=tar/}
@@ -9,6 +9,7 @@ MASTER_SITES=	${MASTER_SITE_GNU:=tar/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/tar/tar.html
 COMMENT=	The GNU tape archiver with remote magnetic tape support
+LICENSE=	gnu-gpl-v3
 
 CONFLICTS=	gcpio-[0-9]*
 
diff --git a/archivers/gtar-base/distinfo b/archivers/gtar-base/distinfo
index d96c09f3424..a4aa8c1066c 100644
--- a/archivers/gtar-base/distinfo
+++ b/archivers/gtar-base/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.23 2009/01/20 00:33:56 tnn Exp $
+$NetBSD: distinfo,v 1.24 2009/08/16 13:53:32 wiz Exp $
 
-SHA1 (tar-1.20.tar.gz) = 1bc0731a00f2483f381c48e0b3f359877ddff910
-RMD160 (tar-1.20.tar.gz) = 6ac6847b4d0f4fcd61408f63df18b503699f2fb9
-Size (tar-1.20.tar.gz) = 2822777 bytes
+SHA1 (tar-1.22.tar.gz) = 79875be57ca47d16ab41fc1bf3853efe68b81167
+RMD160 (tar-1.22.tar.gz) = 92aae7f6ebce77d1e334acc59320980c4ce7ffe4
+Size (tar-1.22.tar.gz) = 2998989 bytes
 SHA1 (patch-ab) = bc2cb4547a0df1d1877a3d09a6e3969123ddecab
 SHA1 (patch-ad) = c5106ba2d0a0414ccbc55dfbf71c95280080b190
-SHA1 (patch-ae) = 99323cf270e3e60dd21db42aea3556dd9255cef2
-SHA1 (patch-af) = 8e57e09e3b1a79310dc343c3741fc94916788b79
+SHA1 (patch-af) = 2965f2dbbf4914daab3ffcc067acbc2bac6729e7
 SHA1 (patch-ag) = 8e1f6d2b6d38a029485cd7a1987cc6acb6a4cc84
 SHA1 (patch-ah) = f1e26c3474982b9cef494554cd6e876c86afc22c
 SHA1 (patch-ai) = 93904441dc0bfc100ce07845a0ba3c3b2c74ba25
diff --git a/archivers/gtar-base/patches/patch-ae b/archivers/gtar-base/patches/patch-ae
deleted file mode 100644
index 0bee1e86e3d..00000000000
--- a/archivers/gtar-base/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.8 2008/05/18 01:48:09 tnn Exp $
-
---- lib/Makefile.in.orig	2008-04-14 14:03:58.000000000 +0200
-+++ lib/Makefile.in
-@@ -980,7 +980,6 @@ check: $(BUILT_SOURCES)
- all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(HEADERS) all-local
- installdirs:
- install: $(BUILT_SOURCES)
--	$(MAKE) $(AM_MAKEFLAGS) install-am
- install-exec: install-exec-am
- install-data: install-data-am
- uninstall: uninstall-am
diff --git a/archivers/gtar-base/patches/patch-af b/archivers/gtar-base/patches/patch-af
index 4bf81944be2..4870798fa84 100644
--- a/archivers/gtar-base/patches/patch-af
+++ b/archivers/gtar-base/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.4 2008/05/18 01:48:09 tnn Exp $
+$NetBSD: patch-af,v 1.5 2009/08/16 13:53:32 wiz Exp $
 
---- tests/testsuite.orig	2008-04-14 14:11:06.000000000 +0200
+--- tests/testsuite.orig	2009-03-05 07:18:59.000000000 +0000
 +++ tests/testsuite
 @@ -620,7 +620,7 @@ at_times_file=$at_suite_dir/at-times
  # List of the tested programs.
  at_tested='tar'
  # List of the all the test groups.
--at_groups_all=' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74'
-+at_groups_all=' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74'
+-at_groups_all=' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77'
++at_groups_all=' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77'
  # As many question marks as there are digits in the last test group number.
  # Used to normalize the test group numbers so that `ls' lists them in
  # numerical order.
diff --git a/archivers/gtar-info/Makefile b/archivers/gtar-info/Makefile
index e4c0949a984..ab882edbaa3 100644
--- a/archivers/gtar-info/Makefile
+++ b/archivers/gtar-info/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2008/05/18 01:48:58 tnn Exp $
+# $NetBSD: Makefile,v 1.27 2009/08/16 13:53:32 wiz Exp $
 #
 
-DISTNAME=	tar-1.20
-PKGNAME=	gtar-info-1.20
+DISTNAME=	tar-1.22
+PKGNAME=	gtar-info-1.22
 SVR4_PKGNAME=	gtari
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_GNU:=tar/}
@@ -10,6 +10,7 @@ MASTER_SITES=	${MASTER_SITE_GNU:=tar/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/tar/tar.html
 COMMENT=	Info format documentation for the GNU tape archiver
+LICENSE=	gnu-fdl-v1.1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
diff --git a/archivers/gtar-info/distinfo b/archivers/gtar-info/distinfo
index 8e2e7fb8e0d..935327829fc 100644
--- a/archivers/gtar-info/distinfo
+++ b/archivers/gtar-info/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2008/05/18 01:48:58 tnn Exp $
+$NetBSD: distinfo,v 1.8 2009/08/16 13:53:32 wiz Exp $
 
-SHA1 (tar-1.20.tar.gz) = 1bc0731a00f2483f381c48e0b3f359877ddff910
-RMD160 (tar-1.20.tar.gz) = 6ac6847b4d0f4fcd61408f63df18b503699f2fb9
-Size (tar-1.20.tar.gz) = 2822777 bytes
+SHA1 (tar-1.22.tar.gz) = 79875be57ca47d16ab41fc1bf3853efe68b81167
+RMD160 (tar-1.22.tar.gz) = 92aae7f6ebce77d1e334acc59320980c4ce7ffe4
+Size (tar-1.22.tar.gz) = 2998989 bytes
diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index fff0e672c31..76ad0df5abc 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2009/07/17 04:47:27 rillig Exp $
+# $NetBSD: Makefile,v 1.38 2009/08/16 13:53:32 wiz Exp $
 
-DISTNAME=	gtar-1.20
+DISTNAME=	gtar-1.22
 CATEGORIES=	archivers
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -8,11 +8,12 @@ DISTFILES=	# empty
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/tar/tar.html
 COMMENT=	The "meta-package" for the GNU tape archiver (tar)
+LICENSE=	gnu-gpl-v3 AND gnu-fdl-v1.1
 
 META_PACKAGE=	yes
 
-DEPENDS+=	gtar-base-1.20{,nb*}:../../archivers/gtar-base
-DEPENDS+=	gtar-info-1.20{,nb*}:../../archivers/gtar-info
+DEPENDS+=	gtar-base-1.22{,nb*}:../../archivers/gtar-base
+DEPENDS+=	gtar-info-1.22{,nb*}:../../archivers/gtar-info
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir