5 files changed, 54 insertions, 16 deletions

diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index c78d987c28ed..e67cc68c0b23 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -6,14 +6,23 @@
 #
 
 PORTNAME=	tar
-PORTVERSION=	1.13
+PORTVERSION=	1.13.17
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	tar
+MASTER_SITES=	ftp://alpha.gnu.org/gnu/tar/ \
+		ftp://ftp.sunsite.org.uk/Mirrors/alpha.gnu.org/gnu/tar/ \
+		ftp://ftp.funet.fi/pub/mirrors/alpha.gnu.org/gnu/tar/
 
 MAINTAINER=	andreas@FreeBSD.org
 
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
+
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=--program-prefix=g
+CONFIGURE_ARGS=	--program-prefix=g
+CONFIGURE_ENV=	CPPFLAGS='-I${LOCALBASE}/include' \
+		LDFLAGS='-L${LOCALBASE}/lib' \
+		DEFAULT_ARCHIVE='/dev/rsa0'
+
+post-extract:
+	@rm -f ${WRKSRC}/doc/tar.info*
 
 .include <bsd.port.mk>
diff --git a/archivers/gtar/distinfo b/archivers/gtar/distinfo
index 82eee7db800c..cdba82dbe5d7 100644
--- a/archivers/gtar/distinfo
+++ b/archivers/gtar/distinfo
@@ -1 +1 @@
-MD5 (tar-1.13.tar.gz) = 402a54bdde58dec411ea844b75cf5804
+MD5 (tar-1.13.17.tar.gz) = 4704d86de59410d8687cf2857ffd2f48
diff --git a/archivers/gtar/files/patch-aa b/archivers/gtar/files/patch-aa
new file mode 100644
index 000000000000..e9f4e4f3c316
--- /dev/null
+++ b/archivers/gtar/files/patch-aa
@@ -0,0 +1,20 @@
+--- src/Makefile.in.orig	Wed Sep 27 15:52:00 2000
++++ src/Makefile.in	Wed Sep 27 15:52:14 2000
+@@ -337,7 +337,7 @@
+ 	  fi; \
+ 	done
+ buffer.o: buffer.c system.h ../config.h ../lib/pathmax.h ../lib/error.h \
+-	../lib/xalloc.h ../lib/fnmatch.h ../lib/human.h \
++	../lib/xalloc.h ../lib/human.h \
+ 	../lib/quotearg.h common.h tar.h arith.h ../lib/backupfile.h \
+ 	../lib/basename.h ../lib/exclude.h ../lib/modechange.h \
+ 	../lib/safe-read.h rmt.h
+@@ -376,7 +376,7 @@
+ 	../lib/modechange.h ../lib/safe-read.h ../lib/quotearg.h \
+ 	../lib/save-cwd.h
+ names.o: names.c system.h ../config.h ../lib/pathmax.h ../lib/error.h \
+-	../lib/xalloc.h ../lib/fnmatch.h ../lib/quotearg.h common.h \
++	../lib/xalloc.h ../lib/quotearg.h common.h \
+ 	tar.h arith.h ../lib/backupfile.h ../lib/basename.h \
+ 	../lib/exclude.h ../lib/modechange.h ../lib/safe-read.h
+ open3.o: open3.c system.h ../config.h ../lib/pathmax.h ../lib/error.h \
diff --git a/archivers/gtar/files/patch-ab b/archivers/gtar/files/patch-ab
new file mode 100644
index 000000000000..d587d93f8f5c
--- /dev/null
+++ b/archivers/gtar/files/patch-ab
@@ -0,0 +1,11 @@
+--- 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/pkg-plist b/archivers/gtar/pkg-plist
index e82dcfb64109..1e375507896f 100644
--- a/archivers/gtar/pkg-plist
+++ b/archivers/gtar/pkg-plist
@@ -1,23 +1,21 @@
 bin/gtar
-info/tar.info-8
+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/de/LC_MESSAGES/tar.mo
+share/locale/es/LC_MESSAGES/tar.mo
+share/locale/et/LC_MESSAGES/tar.mo
 share/locale/fr/LC_MESSAGES/tar.mo
 share/locale/it/LC_MESSAGES/tar.mo
+share/locale/ja/LC_MESSAGES/tar.mo
 share/locale/ko/LC_MESSAGES/tar.mo
 share/locale/nl/LC_MESSAGES/tar.mo
 share/locale/no/LC_MESSAGES/tar.mo
 share/locale/pl/LC_MESSAGES/tar.mo
 share/locale/pt/LC_MESSAGES/tar.mo
+share/locale/pt_BR/LC_MESSAGES/tar.mo
+share/locale/ru/LC_MESSAGES/tar.mo
 share/locale/sl/LC_MESSAGES/tar.mo
 share/locale/sv/LC_MESSAGES/tar.mo
-@unexec install-info --delete %D/info/tar.info %D/info/dir
-info/tar.info
-info/tar.info-1
-info/tar.info-2
-info/tar.info-3
-info/tar.info-4
-info/tar.info-5
-info/tar.info-6
-info/tar.info-7
-@exec install-info %D/info/tar.info %D/info/dir