- Revert previous workaround, 8.0-CURRENT has grown fdopendir(3).

- Update to 1.20.
  Notable changes: This release adds support for lzma compression
  and the -a option to select the compression algorithm based on
  the suffix of the archive file name.

4 files changed, 9 insertions, 28 deletions

diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index 72bdc66e378e..6f9953fe8ce0 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -6,14 +6,17 @@
 #
 
 PORTNAME=	tar
-PORTVERSION=	1.19
+PORTVERSION=	1.20
 CATEGORIES=	archivers sysutils
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	g
 
 MAINTAINER=	naddy@FreeBSD.org
-COMMENT=	GNU version of the traditional tar archiver
+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
 
 INFO=		tar
 
@@ -25,9 +28,6 @@ CONFIGURE_ENV=	CPPFLAGS='-I${LOCALBASE}/include' \
 		LDFLAGS='-L${LOCALBASE}/lib ${LDSTATIC}' \
 		DEFAULT_ARCHIVE=/dev/sa0 \
 		DEFAULT_RMT_COMMAND=/etc/rmt
-# GNU assumes that openat() implies the existence of fdopendir(),
-# which does not hold true on FreeBSD 8.
-CONFIGURE_ENV+=	ac_cv_func_openat=no
 
 .if defined(WANT_STATIC)
 LDSTATIC=	-static
diff --git a/archivers/gtar/distinfo b/archivers/gtar/distinfo
index db617aac221e..432fafa9df1a 100644
--- a/archivers/gtar/distinfo
+++ b/archivers/gtar/distinfo
@@ -1,3 +1,3 @@
-MD5 (tar-1.19.tar.bz2) = bcc2e19b19823b9ab68c94586067a792
-SHA256 (tar-1.19.tar.bz2) = c690d46da77b1ee07b7c758de46d6d07da698a75e63ed3e8f83e3fca8f809cb4
-SIZE (tar-1.19.tar.bz2) = 1882486
+MD5 (tar-1.20.tar.bz2) = 1a7e17f27abf583b3b0bc059a827e68b
+SHA256 (tar-1.20.tar.bz2) = be8bf33afb5adc2377e45d94693ffd46b75f267f9b808df0c7006e51211f9deb
+SIZE (tar-1.20.tar.bz2) = 1912591
diff --git a/archivers/gtar/files/patch-lib_getcwd.c b/archivers/gtar/files/patch-lib_getcwd.c
deleted file mode 100644
index 754edc925619..000000000000
--- a/archivers/gtar/files/patch-lib_getcwd.c
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- lib/getcwd.c.orig
-+++ lib/getcwd.c
-@@ -30,6 +30,10 @@
- 
- #include <fcntl.h> /* For AT_FDCWD on Solaris 9.  */
- 
-+#ifdef __FreeBSD__
-+# undef AT_FDCWD
-+#endif
-+
- #ifndef __set_errno
- # define __set_errno(val) (errno = (val))
- #endif
diff --git a/archivers/gtar/pkg-plist b/archivers/gtar/pkg-plist
index a7e28ecbf746..96d80469b5c3 100644
--- a/archivers/gtar/pkg-plist
+++ b/archivers/gtar/pkg-plist
@@ -23,13 +23,11 @@ libexec/grmt
 %%NLS%%share/locale/ms/LC_MESSAGES/tar.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/tar.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/tar.mo
-%%NLS%%share/locale/no/LC_MESSAGES/tar.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/tar.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/tar.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/tar.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/tar.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/tar.mo
-%%NLS%%share/locale/rw/LC_MESSAGES/tar.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/tar.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/tar.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/tar.mo
@@ -37,7 +35,6 @@ libexec/grmt
 %%NLS%%share/locale/uk/LC_MESSAGES/tar.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/tar.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/tar.mo
-%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/rw
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/tar.mo
 %%NLS%%@dirrmtry share/locale/ky/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ky