5 files changed, 7 insertions, 99 deletions
diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index 0f1b35037618..605ff2c6a724 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tar
-PORTVERSION=	1.21
+PORTVERSION=	1.22
 CATEGORIES=	archivers sysutils
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,9 +15,9 @@ PKGNAMEPREFIX=	g
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	GNU version of the traditional tape archiver
 
-# Actually we need lzma(1), but not the one in archivers/lzma.
-RUN_DEPENDS=	${LOCALBASE}/bin/lzcat:${PORTSDIR}/archivers/lzmautils
-RUN_DEPENDS+=	lzop:${PORTSDIR}/archivers/lzop
+RUN_DEPENDS=	lzop:${PORTSDIR}/archivers/lzop
+# Add xz once the lzma/lzmautils/xz confusion has settled down
+#RUN_DEPENDS+=	xz:${PORTSDIR}/archivers/lzmautils-devel
 
 INFO=		tar
 
diff --git a/archivers/gtar/distinfo b/archivers/gtar/distinfo
index c40e64f3a543..2275687ad382 100644
--- a/archivers/gtar/distinfo
+++ b/archivers/gtar/distinfo
@@ -1,3 +1,3 @@
-MD5 (tar-1.21.tar.bz2) = 4f9028d231c3e7d7bdd658e14e74c2d1
-SHA256 (tar-1.21.tar.bz2) = dc6c70d2071ca4a928460b6d68ab500a32e67d50255261a0d17765a307aeb350
-SIZE (tar-1.21.tar.bz2) = 2071237
+MD5 (tar-1.22.tar.bz2) = 07fa517027f426bb80f5f5ff91b63585
+SHA256 (tar-1.22.tar.bz2) = 3cefb67f197a3f8f5235999fe749ced0889466a71ddcbc96fddca84e5d53aa4d
+SIZE (tar-1.22.tar.bz2) = 2094575
diff --git a/archivers/gtar/files/patch-tests_pipe.at b/archivers/gtar/files/patch-tests_pipe.at
deleted file mode 100644
index fcea2ad557cd..000000000000
--- a/archivers/gtar/files/patch-tests_pipe.at
+++ /dev/null
@@ -1,24 +0,0 @@
-
-$FreeBSD$
-
---- tests/pipe.at.orig
-+++ tests/pipe.at
-@@ -30,7 +30,8 @@
- 
- AT_KEYWORDS([pipe])
- 
--AT_TAR_CHECK([
-+AT_TAR_WITH_HOOK([TAR_IGNREC_HOOK],
-+[AT_TAR_CHECK([
- AT_SORT_PREREQ
- 
- mkdir directory
-@@ -49,6 +50,7 @@
- directory/file2
- separator
- separator
--])
-+],
-+[stderr])])
- 
- AT_CLEANUP
diff --git a/archivers/gtar/files/patch-tests_shortrec.at b/archivers/gtar/files/patch-tests_shortrec.at
deleted file mode 100644
index cb7ed073ee6c..000000000000
--- a/archivers/gtar/files/patch-tests_shortrec.at
+++ /dev/null
@@ -1,33 +0,0 @@
-
-$FreeBSD$
-
---- tests/shortrec.at.orig
-+++ tests/shortrec.at
-@@ -23,17 +23,22 @@
- # used to create the archive.
- 
- AT_SETUP([short records])
--AT_KEYWORDS([shortrec.at])
-+AT_KEYWORDS([shortrec])
- 
--AT_TAR_CHECK([
-+AT_TAR_WITH_HOOK([TAR_IGNREC_HOOK],
-+[AT_TAR_CHECK([
- mkdir directory
- (cd directory && touch a b c d e f g h i j k l m n o p q r)
--tar -c -b 1 -f - directory | tar -t -f - >/dev/null
-+tar -c -b 1 -f - directory | tar -t -f - 
- tar -c -b 1 -f archive directory
--tar -t -f archive >/dev/null
--tar -t -f - < archive >/dev/null
-+tar -t -f archive 
-+tar -t -f - < archive 
- 
- rm -r directory
-+],
-+[0],
-+[ignore],
-+[stderr])
- ])
- 
- AT_CLEANUP
diff --git a/archivers/gtar/files/patch-tests_testsuite.at b/archivers/gtar/files/patch-tests_testsuite.at
deleted file mode 100644
index f91691c5d63b..000000000000
--- a/archivers/gtar/files/patch-tests_testsuite.at
+++ /dev/null
@@ -1,35 +0,0 @@
-
-$FreeBSD$
-
---- tests/testsuite.at.orig
-+++ tests/testsuite.at
-@@ -21,6 +21,7 @@
- # We need a recent Autotest.
- m4_version_prereq([2.52g])
- 
-+m4_define([AT_TAR_CHECK_HOOK])
- m4_define([AT_TAR_CHECK],[
-   AT_XFAIL_IF(test -f $[]XFAILFILE)
-   m4_foreach([FMT],
-@@ -33,9 +34,20 @@
- TAR_OPTIONS="-H FMT"
- export TAR_OPTIONS
- rm -rf *
--$1)],$2,$3,$4,$5,$6)])
-+$1)],$2,$3,$4,$5,$6)
-+              AT_TAR_CHECK_HOOK])
- ])
- 
-+m4_define([AT_TAR_WITH_HOOK],[
-+  m4_pushdef([AT_TAR_CHECK_HOOK],[$1])
-+  $2
-+  
-+  m4_popdef([AT_TAR_CHECK_HOOK])])
-+
-+m4_define([TAR_IGNREC_HOOK],[
-+  AT_CHECK([grep -v '^.*tar: Record size = ' stderr; exit 0])
-+])
-+  
- m4_define([RE_CHECK],[
- AT_DATA([$1.re],[$2])
- awk '{print NR " " $[]0}' $1 > $[]$.1