7 files changed, 95 insertions, 36 deletions

diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index 333608612d08..5b9084d83108 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tar
-PORTVERSION=	1.13.19
+PORTVERSION=	1.13.22
 PKGNAMEPREFIX=	g
 CATEGORIES=	archivers sysutils
 MASTER_SITES=	ftp://alpha.gnu.org/gnu/tar/ \
@@ -20,12 +20,13 @@ 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 ${LDSTATIC}' \
 		DEFAULT_ARCHIVE='/dev/sa0'
 
 .if defined(WANT_STATIC)
-CONFIGURE_ENV+=	LDFLAGS='-L${LOCALBASE}/lib -static'
+LDSTATIC=	-static
 .else
-CONFIGURE_ENV+=	LDFLAGS='-L${LOCALBASE}/lib'
+LDSTATIC=
 .endif
 
 .include <bsd.port.mk>
diff --git a/archivers/gtar/distinfo b/archivers/gtar/distinfo
index e3dc26e3b16f..4a027ceff778 100644
--- a/archivers/gtar/distinfo
+++ b/archivers/gtar/distinfo
@@ -1 +1 @@
-MD5 (tar-1.13.19.tar.gz) = ff10ade59f5b312869ffb2f229177e14
+MD5 (tar-1.13.22.tar.gz) = 6336bb0531efec441617a2fc5211b396
diff --git a/archivers/gtar/files/patch-configure b/archivers/gtar/files/patch-configure
new file mode 100644
index 000000000000..804028c3abf4
--- /dev/null
+++ b/archivers/gtar/files/patch-configure
@@ -0,0 +1,86 @@
+--- configure.orig	Wed Aug 29 23:44:29 2001
++++ configure	Sat Sep  8 07:57:39 2001
+@@ -3734,9 +3734,9 @@
+       fi
+ 
+ test $jm_cv_func_decl_free != yes
+-
++ac_status=$?
+ cat >>confdefs.h <<EOF
+-#define HAVE_DECL_FREE $?
++#define HAVE_DECL_FREE $ac_status
+ EOF
+ 
+   echo "$as_me:3742: checking whether getgrgid is declared" >&5
+@@ -3791,9 +3791,9 @@
+       fi
+ 
+ test $jm_cv_func_decl_getgrgid != yes
+-
++ac_status=$?
+ cat >>confdefs.h <<EOF
+-#define HAVE_DECL_GETGRGID $?
++#define HAVE_DECL_GETGRGID $ac_status
+ EOF
+ 
+   echo "$as_me:3799: checking whether getpwuid is declared" >&5
+@@ -3848,9 +3848,9 @@
+       fi
+ 
+ test $jm_cv_func_decl_getpwuid != yes
+-
++ac_status=$?
+ cat >>confdefs.h <<EOF
+-#define HAVE_DECL_GETPWUID $?
++#define HAVE_DECL_GETPWUID $ac_status
+ EOF
+ 
+   echo "$as_me:3856: checking whether getenv is declared" >&5
+@@ -3905,9 +3905,9 @@
+       fi
+ 
+ test $jm_cv_func_decl_getenv != yes
+-
++ac_status=$?
+ cat >>confdefs.h <<EOF
+-#define HAVE_DECL_GETENV $?
++#define HAVE_DECL_GETENV $ac_status
+ EOF
+ 
+   echo "$as_me:3913: checking whether malloc is declared" >&5
+@@ -3962,9 +3962,9 @@
+       fi
+ 
+ test $jm_cv_func_decl_malloc != yes
+-
++ac_status=$?
+ cat >>confdefs.h <<EOF
+-#define HAVE_DECL_MALLOC $?
++#define HAVE_DECL_MALLOC $ac_status
+ EOF
+ 
+   echo "$as_me:3970: checking whether strtoul is declared" >&5
+@@ -4019,9 +4019,9 @@
+       fi
+ 
+ test $jm_cv_func_decl_strtoul != yes
+-
++ac_status=$?
+ cat >>confdefs.h <<EOF
+-#define HAVE_DECL_STRTOUL $?
++#define HAVE_DECL_STRTOUL $ac_status
+ EOF
+ 
+   echo "$as_me:4027: checking whether strtoull is declared" >&5
+@@ -4076,9 +4076,9 @@
+       fi
+ 
+ test $jm_cv_func_decl_strtoull != yes
+-
++ac_status=$?
+ cat >>confdefs.h <<EOF
+-#define HAVE_DECL_STRTOULL $?
++#define HAVE_DECL_STRTOULL $ac_status
+ EOF
+ 
+ echo "$as_me:4084: checking which ioctl field to test for reversed bytes" >&5
diff --git a/archivers/gtar/files/patch-lib_dirname_c b/archivers/gtar/files/patch-lib_dirname_c
deleted file mode 100644
index e3b34c334fdc..000000000000
--- a/archivers/gtar/files/patch-lib_dirname_c
+++ /dev/null
@@ -1,16 +0,0 @@
-$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-lib_prepargs_c b/archivers/gtar/files/patch-lib_prepargs_c
deleted file mode 100644
index 155ec9fb57a1..000000000000
--- a/archivers/gtar/files/patch-lib_prepargs_c
+++ /dev/null
@@ -1,15 +0,0 @@
-$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 @@
- #endif
- #include "prepargs.h"
- #include <sys/types.h>
-+#if HAVE_STRING_H
-+# include <string.h>
-+#else
-+# include <strings.h>
-+#endif
- #include <xalloc.h>
- 
- #include <ctype.h>
diff --git a/archivers/gtar/pkg-descr b/archivers/gtar/pkg-descr
index b60fa9bbf969..4af8c89bc921 100644
--- a/archivers/gtar/pkg-descr
+++ b/archivers/gtar/pkg-descr
@@ -10,3 +10,5 @@ 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.
+
+WWW: http://www.gnu.org/software/tar/tar.html
diff --git a/archivers/gtar/pkg-plist b/archivers/gtar/pkg-plist
index 420c2324eea6..32cb85420bc1 100644
--- a/archivers/gtar/pkg-plist
+++ b/archivers/gtar/pkg-plist
@@ -10,9 +10,9 @@ 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/id/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
@@ -21,3 +21,4 @@ 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
+share/locale/tr/LC_MESSAGES/tar.mo