8 files changed, 40 insertions, 21 deletions

diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index c9797095d50b..1a10379923fb 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	tar
-PORTVERSION=	1.13.18
-PORTREVISION=	3
+PORTVERSION=	1.13.19
 PKGNAMEPREFIX=	g
 CATEGORIES=	sysutils archivers
 MASTER_SITES=	ftp://alpha.gnu.org/gnu/tar/ \
@@ -21,10 +20,12 @@ LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=g
 CONFIGURE_ENV=	CPPFLAGS='-I${LOCALBASE}/include' \
-		LDFLAGS='-L${LOCALBASE}/lib' \
-		DEFAULT_ARCHIVE='/dev/rsa0'
+		DEFAULT_ARCHIVE='/dev/sa0'
 
-post-extract:
-	@rm -f ${WRKSRC}/doc/tar.info*
+.if defined(WANT_STATIC)
+CONFIGURE_ENV+=	LDFLAGS='-L${LOCALBASE}/lib -static'
+.else
+CONFIGURE_ENV+=	LDFLAGS='-L${LOCALBASE}/lib'
+.endif
 
 .include <bsd.port.mk>
diff --git a/archivers/gtar/distinfo b/archivers/gtar/distinfo
index e05445a10a7d..e3dc26e3b16f 100644
--- a/archivers/gtar/distinfo
+++ b/archivers/gtar/distinfo
@@ -1 +1 @@
-MD5 (tar-1.13.18.tar.gz) = fd76b10a8e57cb944f0b2c9cb8bf742b
+MD5 (tar-1.13.19.tar.gz) = ff10ade59f5b312869ffb2f229177e14
diff --git a/archivers/gtar/files/patch-ab b/archivers/gtar/files/patch-ab
deleted file mode 100644
index d587d93f8f5c..000000000000
--- a/archivers/gtar/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig	Wed Sep 27 19:15:21 2000
-+++ doc/Makefile.in	Wed Sep 27 19:15:33 2000
-@@ -80,7 +80,7 @@
- INTLLIBS = @INTLLIBS@
- INTLOBJS = @INTLOBJS@
- LIBOBJS = @LIBOBJS@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = @MAKEINFO@ --no-split
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
- PACKAGE = @PACKAGE@
diff --git a/archivers/gtar/files/patch-lib_dirname_c b/archivers/gtar/files/patch-lib_dirname_c
new file mode 100644
index 000000000000..e3b34c334fdc
--- /dev/null
+++ b/archivers/gtar/files/patch-lib_dirname_c
@@ -0,0 +1,16 @@
+$FreeBSD$
+--- lib/dirname.c.orig	Wed Jan 31 02:08:57 2001
++++ lib/dirname.c	Wed Jan 31 02:10:31 2001
+@@ -19,6 +19,12 @@
+ # include <config.h>
+ #endif
+ 
++#if HAVE_STRING_H
++# include <string.h>
++#else
++# include <strings.h>
++#endif
++
+ #if HAVE_STDLIB_H
+ # include <stdlib.h>
+ #endif
diff --git a/archivers/gtar/files/patch-ac b/archivers/gtar/files/patch-lib_prepargs_c
index 3dd285d8f301..155ec9fb57a1 100644
--- a/archivers/gtar/files/patch-ac
+++ b/archivers/gtar/files/patch-lib_prepargs_c
@@ -1,3 +1,4 @@
+$FreeBSD$
 --- lib/prepargs.c.orig	Thu Nov 16 01:32:16 2000
 +++ lib/prepargs.c	Thu Nov 16 01:32:58 2000
 @@ -23,6 +23,11 @@
diff --git a/archivers/gtar/pkg-comment b/archivers/gtar/pkg-comment
index 1fc615ab0166..7b8fb4030a73 100644
--- a/archivers/gtar/pkg-comment
+++ b/archivers/gtar/pkg-comment
@@ -1 +1 @@
-The GNU tape archiver
+GNU version of the traditional tar archiver
diff --git a/archivers/gtar/pkg-descr b/archivers/gtar/pkg-descr
index cc036a8ba003..b60fa9bbf969 100644
--- a/archivers/gtar/pkg-descr
+++ b/archivers/gtar/pkg-descr
@@ -1 +1,12 @@
-gtar is the GNU Project's Tape Archiver (tar).
+The Free Software Foundation's "tar" tape archiver.
+
+GNU tar saves many files together into a single tape or disk archive,
+and can restore individual files from the archive.  It includes
+multivolume support, the ability to archive sparse files, automatic
+archive compression/decompression, remote archives and special
+features that allow tar to be used for incremental and full backups.
+This distribution also includes rmt, the remote tape server.
+
+Note that this port will install these utilities with a 'g' prefix,
+e.g. gtar, but the texinfo documentation will refer to them without
+the 'g' prefix.
diff --git a/archivers/gtar/pkg-plist b/archivers/gtar/pkg-plist
index 4ab074a5072b..420c2324eea6 100644
--- a/archivers/gtar/pkg-plist
+++ b/archivers/gtar/pkg-plist
@@ -1,7 +1,8 @@
+@comment $FreeBSD$
 bin/gtar
+@unexec install-info --delete %D/info/tar.info %D/info/dir
 info/tar.info
 @exec install-info %D/info/tar.info %D/info/dir
-@unexec install-info --delete %D/info/tar.info %D/info/dir
 libexec/grmt
 share/locale/cs/LC_MESSAGES/tar.mo
 share/locale/da/LC_MESSAGES/tar.mo