summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/gtar-base/Makefile20
-rw-r--r--archivers/gtar-base/PLIST13
-rw-r--r--archivers/gtar-base/distinfo17
-rw-r--r--archivers/gtar-base/files/gtar.15
-rw-r--r--archivers/gtar-base/patches/patch-aa27
-rw-r--r--archivers/gtar-base/patches/patch-ab40
-rw-r--r--archivers/gtar-base/patches/patch-ac6
-rw-r--r--archivers/gtar-base/patches/patch-ae27
-rw-r--r--archivers/gtar-base/patches/patch-af35
-rw-r--r--archivers/gtar-base/patches/patch-ag38
-rw-r--r--archivers/gtar-info/Makefile12
-rw-r--r--archivers/gtar-info/distinfo6
-rw-r--r--archivers/gtar/Makefile11
-rw-r--r--doc/CHANGES5
-rw-r--r--doc/TODO3
15 files changed, 100 insertions, 165 deletions
diff --git a/archivers/gtar-base/Makefile b/archivers/gtar-base/Makefile
index 89451ccdff1..60d6c189374 100644
--- a/archivers/gtar-base/Makefile
+++ b/archivers/gtar-base/Makefile
@@ -1,22 +1,20 @@
-# $NetBSD: Makefile,v 1.36 2004/06/02 23:20:55 heinz Exp $
+# $NetBSD: Makefile,v 1.37 2004/09/27 16:12:04 wiz Exp $
#
-DISTNAME= tar-1.13.25
-PKGNAME= gtar-base-1.13.25
-PKGREVISION= 2
+DISTNAME= tar-1.14
+PKGNAME= gtar-base-1.14
SVR4_PKGNAME= gtarb
CATEGORIES= archivers
-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/
+MASTER_SITES= ${MASTER_SITE_GNU:=tar/}
MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/tar/tar.html
COMMENT= The GNU tape archiver with remote magnetic tape support
-PKG_INSTALLATION_TYPES= overwrite pkgviews
BUILD_USES_MSGFMT= YES
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+
USE_BUILDLINK3= YES
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
@@ -37,6 +35,9 @@ CONFIGURE_ARGS+= --program-prefix=${GTAR_PROGRAM_PREFIX}
.endif
CONFIGURE_ARGS+= --with-catgets
+# lie to configure about gettext -- it does not need GNU gettext
+CONFIGURE_ENV+= gt_cv_func_gnugettext2_libintl=yes
+
PLIST_SUBST+= GTAR_PROGRAM_PREFIX=${GTAR_PROGRAM_PREFIX}
BUILD_DEFS+= GNU_PROGRAM_PREFIX
BUILD_DEFS+= GTAR_PROGRAM_PREFIX
@@ -49,9 +50,6 @@ PLIST_SUBST+= GTAR_LINK=""
PLIST_SUBST+= GTAR_LINK="@comment "
.endif
-post-patch:
- @${TOUCH} ${WRKSRC}/po/fr.po
-
post-install:
${INSTALL_MAN_DIR} ${PREFIX}/man/man1
${INSTALL_DATA} ${FILESDIR}/gtar.1 \
diff --git a/archivers/gtar-base/PLIST b/archivers/gtar-base/PLIST
index 0a6cc36fa77..fd21750aea7 100644
--- a/archivers/gtar-base/PLIST
+++ b/archivers/gtar-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/04/05 18:38:43 reed Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/09/27 16:12:04 wiz Exp $
bin/${GTAR_PROGRAM_PREFIX}tar
${GTAR_LINK}bin/gtar
man/man1/${GTAR_PROGRAM_PREFIX}tar.1
@@ -7,17 +7,26 @@ ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/tar.mo
${PKGLOCALEDIR}/locale/de/LC_MESSAGES/tar.mo
${PKGLOCALEDIR}/locale/es/LC_MESSAGES/tar.mo
${PKGLOCALEDIR}/locale/et/LC_MESSAGES/tar.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/tar.mo
${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/tar.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/tar.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/tar.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/tar.mo
${PKGLOCALEDIR}/locale/id/LC_MESSAGES/tar.mo
${PKGLOCALEDIR}/locale/it/LC_MESSAGES/tar.mo
${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/tar.mo
${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/tar.mo
+${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/tar.mo
+${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/tar.mo
${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/tar.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/tar.mo
${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/tar.mo
${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/tar.mo
${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/tar.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/tar.mo
${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/tar.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/tar.mo
${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/tar.mo
${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/tar.mo
${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/tar.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/tar.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/tar.mo
diff --git a/archivers/gtar-base/distinfo b/archivers/gtar-base/distinfo
index 5b7cb18f5c3..f1ce407ae0a 100644
--- a/archivers/gtar-base/distinfo
+++ b/archivers/gtar-base/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.9 2004/04/24 23:19:27 tv Exp $
+$NetBSD: distinfo,v 1.10 2004/09/27 16:12:04 wiz Exp $
-SHA1 (tar-1.13.25.tar.gz) = d27fda27af621a1182bff289d4bfc7b37019effe
-Size (tar-1.13.25.tar.gz) = 1312227 bytes
-SHA1 (patch-aa) = 607455dae33416396ed9589e74179a097f89adbf
-SHA1 (patch-ab) = 676a9ad625166d052ba8430c4ee19651c25c6451
-SHA1 (patch-ac) = 88f1c52efcad98dfb6688d9184b50f1e8aabe31d
-SHA1 (patch-ae) = c91b7225146d6dd18031a5ebaa69993904c5c078
-SHA1 (patch-af) = 2a5eff3022bcc279131dcd1144fe9c8a7acebecb
-SHA1 (patch-ag) = fdb46bf9c32ae6df32c6569f12e9232217f53506
+SHA1 (tar-1.14.tar.gz) = 484d3ac9c15a598f2ee110155d87b3daecc7b13c
+Size (tar-1.14.tar.gz) = 1485633 bytes
+SHA1 (patch-aa) = df97e08202682939f329f33222540b46ed6baa36
+SHA1 (patch-ab) = 416495f330cb7614eb466547bc468213213e3a90
+SHA1 (patch-ac) = 41d4153b44b5852664401d9be3a0b0a4ef4984eb
+SHA1 (patch-ae) = 428a5a263dd889e09c0d5404eb8d4fe5dbeeb61d
+SHA1 (patch-ag) = 3cb3f8ed288a141896e65410c453b15578943ab3
diff --git a/archivers/gtar-base/files/gtar.1 b/archivers/gtar-base/files/gtar.1
index 72c1c291fa0..18736655852 100644
--- a/archivers/gtar-base/files/gtar.1
+++ b/archivers/gtar-base/files/gtar.1
@@ -1,5 +1,5 @@
.\"
-.\" $NetBSD: gtar.1,v 1.3 2002/11/20 16:57:55 bouyer Exp $
+.\" $NetBSD: gtar.1,v 1.4 2004/09/27 16:12:04 wiz Exp $
.\" @(#)tar.1 1.13.25 2000/12/14 Werner;
.\" from SuSe tar-1.13.25-45.src.rpm
.TH TAR 1 "14 December 2000" "Version 1.13.25"
@@ -63,7 +63,7 @@ tar \- The GNU version of the tar archiving utility
.I directory1 \fR[\fP directory2\fR,\fP \fR...\fP directoryN \fR]
.SH DESCRIPTION
.LP
-This manual page documents the GNU version of
+This manual page documents the GNU version 1.13.25 of
.BR tar ,
an archiving program designed to store and extract files from
an archive file known as a
@@ -263,4 +263,3 @@ reported as a bug in our defect tracking system.
If you really want to understand tar, then you should run info and read the
tar info pages, or use the info mode in emacs.
-
diff --git a/archivers/gtar-base/patches/patch-aa b/archivers/gtar-base/patches/patch-aa
index 775f82547ba..3ccf3f645af 100644
--- a/archivers/gtar-base/patches/patch-aa
+++ b/archivers/gtar-base/patches/patch-aa
@@ -1,22 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2002/11/20 16:57:55 bouyer Exp $
+$NetBSD: patch-aa,v 1.6 2004/09/27 16:12:04 wiz Exp $
---- src/Makefile.in.orig Wed Sep 26 22:34:33 2001
-+++ src/Makefile.in Sun Nov 17 18:04:11 2002
-@@ -103,7 +103,7 @@
-
- AUTOMAKE_OPTIONS = gnits
- bin_PROGRAMS = tar
--libexec_PROGRAMS = @RMT@
-+libexec_PROGRAMS =
- EXTRA_PROGRAMS = rmt
-
- noinst_HEADERS = arith.h common.h rmt.h system.h tar.h
-@@ -127,7 +127,7 @@
- CONFIG_CLEAN_FILES =
- EXTRA_PROGRAMS = rmt$(EXEEXT)
+--- src/Makefile.in.orig 2004-05-11 10:13:27.000000000 +0200
++++ src/Makefile.in
+@@ -44,7 +44,7 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
bin_PROGRAMS = tar$(EXEEXT)
-libexec_PROGRAMS = @RMT@
+libexec_PROGRAMS =
- PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS)
-
- am_rmt_OBJECTS = rmt.$(OBJEXT)
+ EXTRA_PROGRAMS = rmt$(EXEEXT)
+ subdir = src
+ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
diff --git a/archivers/gtar-base/patches/patch-ab b/archivers/gtar-base/patches/patch-ab
index 52f50f5bc01..28a3640f086 100644
--- a/archivers/gtar-base/patches/patch-ab
+++ b/archivers/gtar-base/patches/patch-ab
@@ -1,40 +1,40 @@
-$NetBSD: patch-ab,v 1.8 2002/11/20 16:57:55 bouyer Exp $
+$NetBSD: patch-ab,v 1.9 2004/09/27 16:12:04 wiz Exp $
---- src/tar.c.orig Fri Sep 21 02:11:27 2001
-+++ src/tar.c Sun Nov 17 18:24:55 2002
-@@ -136,6 +136,7 @@
- NEWER_MTIME_OPTION,
+--- src/tar.c.orig 2004-05-10 13:49:19.000000000 +0200
++++ src/tar.c
+@@ -196,6 +196,7 @@ enum
NO_ANCHORED_OPTION,
NO_IGNORE_CASE_OPTION,
+ NO_OVERWRITE_DIR_OPTION,
+ NO_UNLINK_FIRST_OPTION,
NO_WILDCARDS_OPTION,
NO_WILDCARDS_MATCH_SLASH_OPTION,
NULL_OPTION,
-@@ -233,6 +234,7 @@
+@@ -292,6 +293,7 @@ static struct option long_options[] =
{"no-recursion", no_argument, &recursion_option, 0},
{"no-same-owner", no_argument, &same_owner_option, -1},
{"no-same-permissions", no_argument, &same_permissions_option, -1},
+ {"no-unlink-first", no_argument, NULL, NO_UNLINK_FIRST_OPTION},
- {"numeric-owner", no_argument, &numeric_owner_option, 1},
+ {"numeric-owner", no_argument, 0, NUMERIC_OWNER_OPTION},
+ {"occurrence", optional_argument, 0, OCCURRENCE_OPTION},
{"old-archive", no_argument, 0, 'o'},
- {"one-file-system", no_argument, 0, 'l'},
-@@ -266,6 +268,7 @@
+@@ -327,6 +329,7 @@ static struct option long_options[] =
{"touch", no_argument, 0, 'm'},
{"uncompress", no_argument, 0, 'Z'},
{"ungzip", no_argument, 0, 'z'},
+ {"unlink", no_argument, 0, 'U'},
{"unlink-first", no_argument, 0, 'U'},
{"update", no_argument, 0, 'u'},
- {"use-compress-program", required_argument, 0, USE_COMPRESS_PROGRAM_OPTION},
-@@ -327,6 +330,7 @@
+ {"utc", no_argument, 0, UTC_OPTION },
+@@ -390,6 +393,7 @@ Operation modifiers:\n\
--overwrite overwrite existing files when extracting\n\
- --overwrite-dir overwrite directory metadata when extracting\n\
+ --no-overwrite-dir preserve metadata of existing directories\n\
-U, --unlink-first remove each file prior to extracting over it\n\
+ --no-unlink-first don't remove each file prior to extracting\n\
--recursive-unlink empty hierarchies prior to extracting directory\n\
-S, --sparse handle sparse files efficiently\n\
-O, --to-stdout extract files to standard output\n\
-@@ -510,6 +514,7 @@
+@@ -604,6 +608,7 @@ decode_options (int argc, char **argv)
owner_option = -1;
group_option = -1;
@@ -42,14 +42,14 @@ $NetBSD: patch-ab,v 1.8 2002/11/20 16:57:55 bouyer Exp $
backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
-@@ -843,6 +848,10 @@
-
- case 'U':
+@@ -916,6 +921,10 @@ decode_options (int argc, char **argv)
old_files_option = UNLINK_FIRST_OLD_FILES;
-+ break;
-+
+ break;
+
+ case NO_UNLINK_FIRST_OPTION:
+ old_files_option = 0;
++ break;
++
+ case UTC_OPTION:
+ utc_option = true;
break;
-
- case 'v':
diff --git a/archivers/gtar-base/patches/patch-ac b/archivers/gtar-base/patches/patch-ac
index bb9318f9f6d..d982644ed1c 100644
--- a/archivers/gtar-base/patches/patch-ac
+++ b/archivers/gtar-base/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2004/04/24 23:07:53 tv Exp $
+$NetBSD: patch-ac,v 1.5 2004/09/27 16:12:04 wiz Exp $
---- src/system.h.orig Sat Apr 24 19:05:49 2004
+--- src/system.h.orig 2004-05-11 10:11:49.000000000 +0200
+++ src/system.h
-@@ -309,6 +309,9 @@ extern int errno;
+@@ -282,6 +282,9 @@ extern int errno;
#if MAJOR_IN_MKDEV
# include <sys/mkdev.h>
diff --git a/archivers/gtar-base/patches/patch-ae b/archivers/gtar-base/patches/patch-ae
index 90ca861f880..50dfc2bcddf 100644
--- a/archivers/gtar-base/patches/patch-ae
+++ b/archivers/gtar-base/patches/patch-ae
@@ -1,21 +1,18 @@
-$NetBSD: patch-ae,v 1.4 2002/11/20 16:57:55 bouyer Exp $
+$NetBSD: patch-ae,v 1.5 2004/09/27 16:12:04 wiz Exp $
---- Makefile.in.orig Wed Sep 26 22:35:05 2001
-+++ Makefile.in Sun Nov 17 18:32:32 2002
-@@ -102,10 +102,15 @@
- rmt_LDADD = @rmt_LDADD@
- tar_LDADD = @tar_LDADD@
-
-+OPSYS!= uname -s
- AUTOMAKE_OPTIONS = gnits dist-bzip2 dist-shar
+--- Makefile.in.orig 2004-05-11 10:13:22.000000000 +0200
++++ Makefile.in
+@@ -229,7 +229,12 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = ChangeLog.1 PORTS
--SUBDIRS = doc intl lib m4 src scripts po tests
+-SUBDIRS = doc lib src scripts po tests
++OPSYS!= uname -s
+.if ${OPSYS} == "Darwin"
-+SUBDIRS = intl lib m4 src scripts tests
++SUBDIRS = lib src scripts tests
+.else
-+SUBDIRS = intl lib m4 src scripts po tests
++SUBDIRS = lib src scripts po tests
+.endif
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ all: config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
+
diff --git a/archivers/gtar-base/patches/patch-af b/archivers/gtar-base/patches/patch-af
deleted file mode 100644
index cf2e85e49ce..00000000000
--- a/archivers/gtar-base/patches/patch-af
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-af,v 1.1 2002/11/20 16:57:55 bouyer Exp $
-This is based on, tar-dots.patch from RedHat tar-1.13.25-4.7.1.src.rpm, and
-http://www.security.nnov.ru/files/archive/tar-1.13.19.patch
-
---- src/misc.c.orig Mon Nov 11 15:09:06 2002
-+++ src/misc.c Mon Nov 11 15:14:34 2002
-@@ -203,17 +203,25 @@
- {
- char const *p = name + FILESYSTEM_PREFIX_LEN (name);
-
-+ if (ISSLASH (*p)) return 1;
- for (;;)
- {
-- if (p[0] == '.' && p[1] == '.' && (ISSLASH (p[2]) || !p[2]))
-+ if (p[0] == '.' && p[1] == '.' && (!p[2] || ISSLASH (p[2])))
- return 1;
-
- do
- {
-- if (! *p++)
-+ if (! *p)
- return 0;
- }
-- while (! ISSLASH (*p));
-+ while (! ISSLASH (*p++));
-+
-+ do
-+ {
-+ if (! *p++)
-+ return 0;
-+ }
-+ while ( ISSLASH (*p));
- }
- }
-
diff --git a/archivers/gtar-base/patches/patch-ag b/archivers/gtar-base/patches/patch-ag
index f276b9178b9..14d33bb4a09 100644
--- a/archivers/gtar-base/patches/patch-ag
+++ b/archivers/gtar-base/patches/patch-ag
@@ -1,10 +1,9 @@
-$NetBSD: patch-ag,v 1.1 2002/11/20 16:57:55 bouyer Exp $
-This include tar-1.13.19-absolutenames.patch, from RedHat tar-1.13.25-4.7.1.src.rpm
+$NetBSD: patch-ag,v 1.2 2004/09/27 16:12:04 wiz Exp $
---- src/extract.c.orig Sun Nov 17 18:35:32 2002
-+++ src/extract.c Sun Nov 17 18:35:09 2002
-@@ -180,7 +180,11 @@
- mode = current_stat_info->st_mode ^ invert_permissions;
+--- src/extract.c.orig 2004-04-05 09:23:51.000000000 +0200
++++ src/extract.c
+@@ -182,7 +182,11 @@ set_mode (char const *file_name,
+ mode = cur_info->st_mode ^ invert_permissions;
}
+#if (defined (__NetBSD__) && NetBSD > 199706 && !defined(NetBSD1_2))
@@ -15,7 +14,7 @@ This include tar-1.13.19-absolutenames.patch, from RedHat tar-1.13.25-4.7.1.src.
chmod_error_details (file_name, mode);
}
-@@ -216,7 +220,12 @@
+@@ -222,7 +226,12 @@ set_stat (char const *file_name,
{
struct utimbuf utimbuf;
@@ -28,7 +27,7 @@ This include tar-1.13.19-absolutenames.patch, from RedHat tar-1.13.25-4.7.1.src.
{
/* We do the utime before the chmod because some versions of utime are
broken and trash the modes of the file. */
-@@ -229,6 +238,7 @@
+@@ -235,6 +244,7 @@ set_stat (char const *file_name,
/* FIXME: incremental_option should set ctime too, but how? */
@@ -36,7 +35,7 @@ This include tar-1.13.19-absolutenames.patch, from RedHat tar-1.13.25-4.7.1.src.
if (incremental_option)
utimbuf.actime = stat_info->st_atime;
else
-@@ -237,6 +247,16 @@
+@@ -243,6 +253,16 @@ set_stat (char const *file_name,
utimbuf.modtime = stat_info->st_mtime;
if (utime (file_name, &utimbuf) < 0)
@@ -53,24 +52,3 @@ This include tar-1.13.19-absolutenames.patch, from RedHat tar-1.13.25-4.7.1.src.
utime_error (file_name);
else
{
-@@ -1019,10 +1039,19 @@
- {
- struct stat st1, st2;
- int e;
-+ size_t skiplinkcrud;
-+
-+ if (absolute_names_option)
-+ skiplinkcrud = 0;
-+ else {
-+ skiplinkcrud = FILESYSTEM_PREFIX_LEN (current_link_name);
-+ while (ISSLASH (current_link_name[skiplinkcrud]))
-+ skiplinkcrud++;
-+ }
-
- /* MSDOS does not implement links. However, djgpp's link() actually
- copies the file. */
-- status = link (current_link_name, CURRENT_FILE_NAME);
-+ status = link (current_link_name + skiplinkcrud, CURRENT_FILE_NAME);
-
- if (status == 0)
- {
diff --git a/archivers/gtar-info/Makefile b/archivers/gtar-info/Makefile
index f190f862e8a..d5bbffabf00 100644
--- a/archivers/gtar-info/Makefile
+++ b/archivers/gtar-info/Makefile
@@ -1,13 +1,11 @@
-# $NetBSD: Makefile,v 1.16 2004/05/18 11:58:04 recht Exp $
+# $NetBSD: Makefile,v 1.17 2004/09/27 16:12:04 wiz Exp $
#
-DISTNAME= tar-1.13.25
-PKGNAME= gtar-info-1.13.25
+DISTNAME= tar-1.14
+PKGNAME= gtar-info-1.14
SVR4_PKGNAME= gtari
CATEGORIES= archivers
-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/
+MASTER_SITES= ${MASTER_SITE_GNU:=tar/}
MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/tar/tar.html
@@ -17,7 +15,7 @@ INFO_FILES= tar.info
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_BUILDLINK3= yes
+NO_BUILDLINK= yes
NO_CONFIGURE= yes
NO_BUILD= yes
diff --git a/archivers/gtar-info/distinfo b/archivers/gtar-info/distinfo
index 85ee7310b50..2ab0514cdbb 100644
--- a/archivers/gtar-info/distinfo
+++ b/archivers/gtar-info/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/11/20 16:57:56 bouyer Exp $
+$NetBSD: distinfo,v 1.4 2004/09/27 16:12:04 wiz Exp $
-SHA1 (tar-1.13.25.tar.gz) = d27fda27af621a1182bff289d4bfc7b37019effe
-Size (tar-1.13.25.tar.gz) = 1312227 bytes
+SHA1 (tar-1.14.tar.gz) = 484d3ac9c15a598f2ee110155d87b3daecc7b13c
+Size (tar-1.14.tar.gz) = 1485633 bytes
diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index ebd03b3b846..e4fbd70b7d8 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2004/05/18 11:58:04 recht Exp $
+# $NetBSD: Makefile,v 1.26 2004/09/27 16:12:04 wiz Exp $
-DISTNAME= gtar-1.13.25
-PKGREVISION= 2
+DISTNAME= gtar-1.14
CATEGORIES= archivers
MASTER_SITES= # empty
DISTFILES= # empty
@@ -10,12 +9,12 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/tar/tar.html
COMMENT= The "meta-package" for the GNU tape archiver (tar)
-DEPENDS+= gtar-base-1.13.25nb2:../../archivers/gtar-base
-DEPENDS+= gtar-info-1.13.25:../../archivers/gtar-info
+DEPENDS+= gtar-base-1.14:../../archivers/gtar-base
+DEPENDS+= gtar-info-1.14:../../archivers/gtar-info
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_BUILDLINK3= yes
+NO_BUILDLINK= yes
EXTRACT_ONLY= # empty
NO_CHECKSUM= yes
diff --git a/doc/CHANGES b/doc/CHANGES
index 5a47a138f0b..c2cef9dcf58 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.7276 2004/09/27 14:19:44 wiz Exp $
+$NetBSD: CHANGES,v 1.7277 2004/09/27 16:12:04 wiz Exp $
Changes to the packages collection and infrastructure in 2004:
@@ -4470,3 +4470,6 @@ Changes to the packages collection and infrastructure in 2004:
Updated xscreensaver to 4.18 [wiz 2004-09-27]
Updated xscreensaver-demo to 4.18 [wiz 2004-09-27]
Updated xscreensaver-gnome to 4.18 [wiz 2004-09-27]
+ Updated gtar-base to 1.14 [wiz 2004-09-27]
+ Updated gtar-info to 1.14 [wiz 2004-09-27]
+ Updated gtar to 1.14 [wiz 2004-09-27]
diff --git a/doc/TODO b/doc/TODO
index d54c9e9d1e4..9d27fcc147c 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.2173 2004/09/27 14:19:44 wiz Exp $
+$NetBSD: TODO,v 1.2174 2004/09/27 16:12:04 wiz Exp $
Suggested new packages
======================
@@ -273,7 +273,6 @@ Suggested package updates
o gpsdrive-2.09
o gqmpeg-0.91.1
o grace-5.1.17
- o gtar-1.14
o gtkglext-1.0.6
o gtklife-4.1
o gtkmm-2.4.5