Turn this into a meta-package for GNU tar.

12 files changed, 21 insertions, 664 deletions

diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index dabac6fbf4b..d0ad34cd8ce 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -1,35 +1,23 @@
-# $NetBSD: Makefile,v 1.12 1999/09/18 03:36:23 kim Exp $
+# $NetBSD: Makefile,v 1.13 1999/09/18 15:23:42 kim Exp $
 #
 
-DISTNAME=       tar-1.12
-PKGNAME=	gtar-1.12
+DISTNAME=	gtar-1.12
 CATEGORIES=	archivers
-MASTER_SITES=   ${MASTER_SITE_GNU:=tar/}
-EXTRACT_SUFX=	.shar.gz
+MASTER_SITES=	# empty
+DISTFILES=	# empty
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/tar/tar.html
 
-EXTRACT_CMD=	${DECOMPRESS_CMD} ${DOWNLOADED_DISTFILE} | ${SH}
+DEPENDS+=	gtar-base-1.12:../../archivers/gtar-base
+DEPENDS+=	gtar-info-1.12:../../archivers/gtar-info
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS= --program-prefix=g --with-catgets
+EXTRACT_ONLY=	# empty
+NO_CHECKSUM=	yes
+NO_PATCH=	yes
+NO_CONFIGURE=	yes
+NO_BUILD=	yes
 
-.include "../../mk/bsd.prefs.mk"
-
-.if (${OPSYS} != "NetBSD")
-PLIST_SRC=	${WRKDIR}/PLIST
-
-pre-install:
-	-${RM} -f ${WRKDIR}/PLIST
-	${CAT} ${PKGDIR}/PLIST | ${SED} -e 's/cat$$/mo/' > ${WRKDIR}/PLIST
-
-.endif
-
-post-patch:
-	@${ECHO} '' >>${WRKSRC}/po/fr.po
-
-post-install:
-	${INSTALL_DATA} ${FILESDIR}/gtar.1 ${PREFIX}/man/man1/
+do-install:	# empty
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/gtar/files/gtar.1 b/archivers/gtar/files/gtar.1
deleted file mode 100644
index 52be465bdc5..00000000000
--- a/archivers/gtar/files/gtar.1
+++ /dev/null
@@ -1,412 +0,0 @@
-.\" Copyright (c) 1991, 1992, 1993 Free Software Foundation	-*- nroff -*-
-.\" See section COPYING for conditions for redistribution
-.\"
-.\"	Written by John F. Woods <jfw@jfwhome.funhouse.com>
-.\"
-.\"	$NetBSD: gtar.1,v 1.1.1.1 1998/03/04 14:57:13 tv Exp $
-.\"	from NetBSD: tar.1,v 1.8 1997/06/06 07:59:54 jeremy Exp
-.\"
-.Dd 6 August 1994
-.Os NetBSD
-.Dt GTAR 1
-.Sh NAME
-.Nm gtar
-.Nd GNU tape archiver; manipulate "tar" archive files
-.Sh SYNOPSIS
-.Nm
-.Op Cm Bq -
-.Op Cm bundled-options
-.Op Ar [gnu-style-flags]
-.Op Ar tarfile
-.Op Ar blocksize
-.Op Ar exclude-file
-.Op Ar filenames
-.Op Fl C Ar directory-name
-.Sh DESCRIPTION
-.Nm
-is short for 
-.Dq tape archiver,
-so named for historical reasons; the
-.Nm
-program creates, adds files to, or extracts files from an archive file
-in
-.Dq tar
-format, called a
-.Ar tarfile .
-A tarfile is often a magnetic tape, but can be a floppy diskette or any
-regular disk file.
-.Pp
-The first argument word of the
-.Nm
-command line is usually a command word of bundled function and modifier
-letters, optionally preceeded by a dash;
-it must contain exactly one function letter from the set
-.Cm A ,
-.Cm c ,
-.Cm d ,
-.Cm r ,
-.Cm t ,
-.Cm u ,
-.Cm x ,
-for append, create, difference, replace, table of contents, update, and
-extract (further described below).  The command word can also contain other
-function modifiers described below, some of which will take arguments from
-the command line in the order they are specified in the command word (review
-the EXAMPLES section).  Functions and function modifiers can also be specified
-with the GNU argument convention (preceeded by two dashes, one function or
-modifier per word.  Command-line arguments that specify files to
-add to, extract from, or list from an archive may be given as shell
-pattern matching strings.
-.Sh FUNCTIONS
-Exactly one of the following functions must be specified.
-.Pp
-.Bl -tag -width "--concatenate" -compact
-.It Fl A
-.It Fl -catenate
-.It Fl "-concatenate"
-Append the contents of named file, which must itself be a tar archive,
-to the end of the archive (erasing the old end-of-archive block).
-This has the effect of adding the files contained in the named file to
-the first archive, rather than adding the second archive as an element
-of the first.
-.Em Note:
-This option requires a rewritable tarfile,
-and therefore does not work on quarter-inch cartridge tapes.
-.It Fl c
-.It Fl -create
-Create a new archive (or truncates an old one) and writes the named files
-to it.
-.It Fl d
-.It Fl -diff
-.It Fl -compare
-Find differences between files in the archive and corresponding files in
-the file system.
-.It Fl -delete
-Delete named files from the archive (Does not work on quarter-inch tapes).
-.It Fl r
-.It Fl -append
-Append files to the end of an archive (Does not work on quarter-inch tapes).
-.It Fl t
-.It Fl -list
-List the contents of an archive; if filename arguments are given, only those
-files are listed, otherwise the entire table of contents is listed.
-.It Fl u
-.It Fl -update
-Append the named files if the on-disk version has a modification date
-more recent than their copy in the archive (if any).  Does not work on
-quarter-inch tapes.
-.It Fl x
-.It Fl -extract
-.It Fl -get
-Extract files from an archive.  The owner, modification time, and file
-permissions are restored, if possible.  If no
-.Ar file
-arguments are given, extract all the files in the archive.  If a
-.Ar filename
-argument matches the name of a directory on the tape, that directory and
-its contents are extracted (as well as all directories under that directory).
-If the archive contains multiple entries corresponding to the same file
-(see the
-.Fl -append
-command above), the last one extracted will overwrite all earlier versions.
-.El
-.Sh OPTIONS
-The other options to
-.Nm
-may be combined arbitrarily; single-letter options may be bundled in with
-the command word.  Verbose options which take arguments will be
-followed by the argument; single-letter options will consume
-successive command line arguments (see the
-.Sx EXAMPLES
-below).
-.Pp
-.Bl -tag -width "--preserve-permissions" -compact
-.It Fl -help
-Prints a message listing and briefly describing all the command
-options to tar.
-.It Fl -atime-preserve
-Restore the access times on files which are written to tape (note that
-this will change the inode-change time!).
-.It Fl b
-.It Fl -block-size Ar number
-Sets the block size for reading or writing to N 512-byte blocks.
-.It Fl B
-.It Fl -read-full-blocks
-Re-assemble short reads into full blocks (for reading 4.2BSD pipes).
-.It Fl C Ar directory
-.It Fl -directory Ar directory
-Change to
-.Ar directory
-for extraction.
-.It Fl -checkpoint
-Print directory names while reading the archive.
-.It Fl f Ar [hostname:]file
-.It Fl -file  Ar [hostname:]file
-Read or write the specified
-.Ar file
-.Po default is Pa /dev/rst0 Pc .
-If a
-.Ar hostname
-is specified,
-.Nm
-will use
-.Xr rmt 8
-to read or write the specified
-.Ar file
-on a remote machine. If the given
-.Ar file
-is
-.Ql - ,
-then
-.Nm
-uses stdin or stdout.
-.It Fl F Ar file
-.It Fl -info-script Ar file
-.It Fl -new-volume-script Ar file
-Run a script at the end of each archive volume (implies
-.Fl M ) .
-.It Fl -fast-read
-Stop after all non-wildcard extraction targets have been found
-in the archive.
-.It Fl G
-.It Fl -incremental
-Create/list/extract old GNU-format incremental backup.
-.It Fl g Ar file
-.It Fl -listed-incremental Ar file
-Create/list/extract new GNU-format incremental backup.
-.It Fl h
-.It Fl -dereference
-Don't write symlinks as symlinks; write the data of the files they name.
-.It Fl i
-.It Fl -ignore-zeros
-Ignore blocks of zeroes in archive (usually means End-Of-File).
-.It Fl -ignore-failed-read
-Don't exit with non-zero status on unreadable files.
-.It Fl k
-.It Fl -keep-old-files
-Keep files which already exist on disk; don't overwrite them from the archive.
-.It Fl K Ar file
-.It Fl -starting-file Ar file
-Begin at
-.Ar file
-in the archive.
-.It Fl l
-.It Fl -one-file-system
-Stay in local filesystem when creating an archive (do not cross mount
-points).
-.It Fl L Ar number
-.It Fl -tape-length Ar number
-Change tapes after writing N*1024 bytes.
-.It Fl m
-.It Fl -modification-time
-Don't extract file modified time.
-.It Fl M
-.It Fl -multi-volume
-Create/list/extract multi-volume archive.
-.It Fl N Ar date
-.It Fl -after-date Ar date
-.It Fl -newer Ar date
-Only store files newer than
-.Ar date .
-.It Fl o
-.It Fl -old-archive
-.It Fl -portability
-Write a V7 format archive, rather than POSIX format.
-.It Fl O
-.It Fl -to-stdout
-Extract files to standard output.
-.It Fl p
-.It Fl -same-permissions
-.It Fl -preserve-permissions
-Extract all protection information.
-.It Fl -preserve
-Has the effect of
-.Fl p s.
-.It Fl P
-.It Fl -absolute-paths
-Don't strip leading `/'s from file names.
-.It Fl R
-.It Fl -record-number
-Show record number within archive with each message.
-.It Fl -remove-files
-Remove files after adding them to the archive.
-.It Fl s
-.It Fl -same-order
-.It Fl -preserve-order
-List of names to extract is sorted to match archive.
-.It Fl S
-.It Fl -sparse
-Handle "sparse" files efficiently.
-.It Fl T Ar file
-.It Fl -files-from Ar file
-Get names of files to extract or create from
-.Ar file ,
-one per line.
-.It Fl -null
-Modifies behavior of
-.Fl T
-to expect null-terminated names; disables
-.Fl C.
-.It Fl -totals
-Prints total bytes written with
-.Fl -create .
-.It Fl v
-.It Fl -verbose
-Lists files written to archive with
-.Fl -create
-or extracted with
-.Fl -extract ;
-lists file protection information along with file names with
-.Fl -list .
-.It Fl V Ar volume-name
-.It Fl -label Ar volume-name
-Create archive with the given
-.Ar volume-name .
-.It Fl -version
-Print tar program version number.
-.It Fl w
-.It Fl -interactive
-.It Fl -confirmation
-Ask for confirmation for every action.
-.It Fl W
-.It Fl -verify
-Attempt to verify the archive after writing it.
-.It Fl -exclude Ar pattern
-Exclude files matching the
-.Ar pattern
-(don't extract them, don't add them, don't list them).
-.It Fl X Ar file
-.It Fl -exclude-from Ar file
-Exclude files listed in
-.Ar file .
-.It Fl Z
-.It Fl -compress
-.It Fl -uncompress
-Filter the archive through
-.Xr compress 1 .
-.It Fl z
-.It Fl -gzip
-.It Fl -gunzip
-Filter the archive through
-.Xr gzip 1 .
-.It Fl -use-compress-program Ar program
-Filter the archive through
-.Ar program
-(which must accept
-.Fl d
-to mean ``decompress'').
-.It Fl -block-compress
-Block the output of compression program for tapes or floppies
-(otherwise writes will be of odd length, which device drivers may reject).
-.It Fl [0-7][lmh]
-Specify tape drive and density.
-.It Fl -norecurse
-Don't recurse into subdirectories when creating.
-.It Fl -unlink
-Unlink files before creating them.
-.El
-.Sh EXAMPLES
-To create an archive on tape drive
-.Pa /dev/rst0
-with a block size of 20
-blocks, containing files named "bert" and "ernie", you can enter
-.Dl tar cfb /dev/rst0 20 bert ernie
-or
-.Dl tar --create --file /dev/rst0 --block-size 20 bert ernie
-Note that the
-.Fl f
-and
-.Fl b
-flags both require arguments, which they take from the command line in
-the order they were listed in the command word.
-.Pp
-Because
-.Pa /dev/rst0
-is the default device, and 20 is the default block
-size, the above example could have simply been
-.Dl tar c bert ernie
-.Pp
-To extract all the C sources and headers from an archive named
-"backup.tar", type
-.Dl tar xf backup.tar "*.[ch]"
-Note that the pattern must be quoted to prevent the shell from
-attempting to expand it according the files in the current working
-directory (the shell does not have access to the list of files in
-the archive, of course).
-.Pp
-To copy a file hierarchy while preserving metadata, type
-.Dl tar cf - -C srcdir ". |" tar xpf "-C destdir"
-.Pp
-To create a compressed archive on diskette, using gzip, use a command-line like
-.Dl tar --block-compress -z -c -v -f /dev/rfd1a -b 36 tar/
-Note that you cannot mix bundled flags and --style flags; you can use
-single-letter flags in the manner above, rather than having to type
-.Dl tar --block-compress --gzip --verbose --file /dev/rfd1a --block-size 20 tar/
-.Pp
-The above-created diskette can be listed with
-.Dl tar tvfbz /dev/rfd1a 36
-.Pp
-To join two tar archives into a single archive, use
-.Dl tar Af archive1.tar archive2.tar
-which will add the files contained in archive2.tar onto the end of
-archive1.tar (note that this can't be done by simply typing
-.Dl cat archive2.tar >> archive1.tar
-because of the end-of-file block at the end of a tar archive).
-.Sh ENVIRONMENT
-The
-.Nm
-program examines the following environment variables:
-.Bl -tag -width "POSIXLY-CORRECT"
-.It Ev POSIXLY-CORRECT
-Normally, 
-.Nm
-will process flag arguments that appear in the file list.
-If set in the environment, this flag causes
-.Nm
-to consider the first
-non-flag argument to terminate flag processing, as per the POSIX specification.
-.It Ev SHELL
-In interactive mode, a permissible response to the prompt is to
-request to spawn a subshell, which will be "/bin/sh" unless the
-.Ev SHELL
-variable is set.
-.It Ev TAPE
-Changes the default tape drive (which is still overridden by the
-.Fl f
-flag).
-.El
-.Sh FILES
-.Bl -tag -width "/dev/rst0"
-.It Pa /dev/rst0
-The default tape drive.
-.El
-.\" This next request is for sections 1, 6, 7 & 8 only
-.\"     (command return values (to shell) and fprintf/stderr type diagnostics)
-.\" .Sh DIAGNOSTICS
-.Sh SEE ALSO
-.Xr compress 1 ,
-.Xr gzip 1 ,
-.Xr pax 1 ,
-.Xr rmt 8
-.\" .Sh STANDARDS
-.Sh HISTORY
-The tar format has a rich history, dating back to Sixth Edition UNIX.
-The current implementation of tar is the GNU implementation, which
-originated as the public-domain tar written by John Gilmore.
-.Sh AUTHORS
-A cast of thousands, including [as listed in the ChangeLog file in the
-source] John Gilmore (author of original public
-domain version), Jay Fenlason (first GNU author), Joy Kendall, Jim
-Kingdon, David J. MacKenzie, Michael I Bushnell, Noah Friedman, and
-innumerable others who have contributed fixes and additions.
-.Sh BUGS
-The
-.Fl C
-feature does not work like historical tar programs, and is probably
-untrustworthy.
-.Pp
-The
-.Fl A
-command should work to join an arbitrary number of tar archives
-together, but it does not; attempting to do so leaves the
-end-of-archive blocks in place for the second and subsequent archives.
diff --git a/archivers/gtar/files/md5 b/archivers/gtar/files/md5
deleted file mode 100644
index 00fb5a4917e..00000000000
--- a/archivers/gtar/files/md5
+++ /dev/null
@@ -1,3 +0,0 @@
-$NetBSD: md5,v 1.3 1999/09/18 03:36:24 kim Exp $
-
-MD5 (tar-1.12.shar.gz) = 2de18b48856dac3c76863d6eb2b7e5f9
diff --git a/archivers/gtar/files/patch-sum b/archivers/gtar/files/patch-sum
deleted file mode 100644
index 09408fb311f..00000000000
--- a/archivers/gtar/files/patch-sum
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-sum,v 1.3 1999/09/18 03:36:24 kim Exp $
-
-MD5 (patch-aa) = bcc4f474df0bec91c68b2a0a74d94ce5
-MD5 (patch-ab) = c084f2dec72afbc738780f1ef24339f1
-MD5 (patch-ac) = e4f3ddfab9b1a9dfeddbb2d7a977dcc5
-MD5 (patch-ad) = a205544ef8de6e37cbcd85f0b3d8863f
-MD5 (patch-ae) = 1247d0b77f15168128953e9d01b1f0ea
diff --git a/archivers/gtar/patches/patch-aa b/archivers/gtar/patches/patch-aa
deleted file mode 100644
index f7f2155c610..00000000000
--- a/archivers/gtar/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 1999/08/10 05:05:40 christos Exp $
-
---- src/Makefile.in.orig	Fri Apr 25 20:22:06 1997
-+++ src/Makefile.in	Wed Mar  4 09:49:44 1998
-@@ -102,7 +102,7 @@
- 
- AUTOMAKE_OPTIONS = gnits ansi2knr
- bin_PROGRAMS = tar
--libexec_PROGRAMS = @RMT@
-+libexec_PROGRAMS = 
- EXTRA_PROGRAMS = rmt
- 
- noinst_HEADERS = arith.h common.h rmt.h system.h tar.h
diff --git a/archivers/gtar/patches/patch-ab b/archivers/gtar/patches/patch-ab
deleted file mode 100644
index 3aacabdcc03..00000000000
--- a/archivers/gtar/patches/patch-ab
+++ /dev/null
@@ -1,121 +0,0 @@
-$NetBSD: patch-ab,v 1.5 1999/08/10 05:05:40 christos Exp $
-
---- src/extract.c.orig	Tue Apr 22 20:05:57 1997
-+++ src/extract.c	Fri Mar  6 14:33:05 1998
-@@ -103,7 +103,11 @@
- 
-   if (!keep_old_files_option
-       || (stat_info->st_mode & (S_ISUID | S_ISGID | S_ISVTX)))
-+#ifdef __NetBSD__
-+    if (lchmod (file_name, ~current_umask & (int) stat_info->st_mode) < 0)
-+#else
-     if (chmod (file_name, ~current_umask & (int) stat_info->st_mode) < 0)
-+#endif
-       ERROR ((0, errno, _("%s: Cannot change mode to %0.4o"),
- 	      file_name, ~current_umask & (int) stat_info->st_mode));
- }
-@@ -124,8 +128,10 @@
- {
-   struct utimbuf utimbuf;
- 
-+#ifndef __NetBSD__
-   if (!symlink_flag)
-     {
-+#endif
-       /* We do the utime before the chmod because some versions of utime are
- 	 broken and trash the modes of the file.  */
- 
-@@ -137,6 +143,7 @@
- 
- 	  /* FIXME: incremental_option should set ctime too, but how?  */
- 
-+#ifndef __NetBSD__
- 	  if (incremental_option)
- 	    utimbuf.actime = stat_info->st_atime;
- 	  else
-@@ -145,6 +152,19 @@
- 	  utimbuf.modtime = stat_info->st_mtime;
- 
- 	  if (utime (file_name, &utimbuf) < 0)
-+#else
-+	  struct timeval tv[2];
-+
-+	  if (incremental_option)
-+	    tv[0].tv_sec = stat_info->st_atime;
-+	  else
-+	    tv[0].tv_sec = now;
-+	  tv[0].tv_usec = 0;
-+	  tv[1].tv_sec = stat_info->st_mtime;
-+	  tv[1].tv_usec = 0;
-+
-+	  if (lutimes (file_name, tv) < 0)
-+#endif
- 	    ERROR ((0, errno,
- 		    _("%s: Could not change access and modification times"),
- 		    file_name));
-@@ -155,7 +175,9 @@
- 	 have to set permissions prior to possibly giving files away.  */
- 
-       set_mode (file_name, stat_info);
-+#ifndef __NetBSD__
-     }
-+#endif
- 
-   /* If we are root, set the owner and group of the extracted file, so we
-      extract as the original owner.  Or else, if we are running as a user,
---- src/tar.c.orig	Fri Apr 25 16:09:49 1997
-+++ src/tar.c	Sat Mar  7 21:43:15 1998
-@@ -163,6 +163,7 @@
- #define SUFFIX_OPTION			15
- #define USE_COMPRESS_PROGRAM_OPTION	16
- #define VOLNO_FILE_OPTION		17
-+#define NO_UNLINK_FIRST_OPTION		20
- 
- /* Some cleanup is being made in GNU tar long options.  Using old names is
-    allowed for a while, but will also send a warning to stderr.  Take old
-@@ -237,6 +238,8 @@
-   {"newer-mtime", required_argument, NULL, NEWER_MTIME_OPTION},
-   {"null", no_argument, NULL, NULL_OPTION},
-   {"no-recursion", no_argument, NULL, NO_RECURSE_OPTION},
-+  {"norecurse", no_argument, NULL, NO_RECURSE_OPTION},
-+  {"no-unlink-first", no_argument, NULL, NO_UNLINK_FIRST_OPTION},
-   {"numeric-owner", no_argument, &numeric_owner_option, 1},
-   {"old-archive", no_argument, NULL, 'o'},
-   {"one-file-system", no_argument, NULL, 'l'},
-@@ -267,6 +270,7 @@
-   {"touch", no_argument, NULL, 'm'},
-   {"uncompress", no_argument, NULL, 'Z'},
-   {"ungzip", no_argument, NULL, 'z'},
-+  {"unlink", no_argument, NULL, 'U'},
-   {"unlink-first", no_argument, NULL, 'U'},
-   {"update", no_argument, NULL, 'u'},
-   {"use-compress-program", required_argument, NULL, USE_COMPRESS_PROGRAM_OPTION},
-@@ -320,7 +324,8 @@
-   -W, --verify               attempt to verify the archive after writing it\n\
-       --remove-files         remove files after adding them to the archive\n\
-   -k, --keep-old-files       don't overwrite existing files when extracting\n\
--  -U, --unlink-first         remove each file prior to extracting over it\n\
-+  -U, --unlink-first         remove each file prior to extracting (default)\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\
-@@ -487,6 +492,7 @@
- 
-   owner_option = -1;
-   group_option = -1;
-+  unlink_first_option = 1;
- 
-   backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
-   version_control_string = getenv ("VERSION_CONTROL");
-@@ -780,6 +786,10 @@
- 
-       case 'U':
- 	unlink_first_option = 1;
-+	break;
-+
-+      case NO_UNLINK_FIRST_OPTION:
-+	unlink_first_option = 0;
- 	break;
- 
-       case 'v':
diff --git a/archivers/gtar/patches/patch-ac b/archivers/gtar/patches/patch-ac
deleted file mode 100644
index 43a23ee7101..00000000000
--- a/archivers/gtar/patches/patch-ac
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ac,v 1.1 1998/08/15 00:12:10 tv Exp $
-
---- intl/xopen-msg.sed.orig	Mon Apr  7 00:28:52 1997
-+++ intl/xopen-msg.sed	Fri Aug 14 19:18:49 1998
-@@ -81,6 +81,8 @@
-   G
-   s/^[^\n]*$/& /
-   s/\(.*\)\n\([0-9]*\)/\2 \1/
-+# Change escaped quotes into regular quotes.
-+  s/\\*"/"/g
- # Clear flag from last substitution.
-   tb
- # Append the next line.
-@@ -90,12 +92,16 @@
-   s/\(.*\n\)"\(.*\)"/\1\2/
- # Yes, then branch.
-   ta
-+# Comment out if no message exists.
-+  s/^\([0-9]* *\n\)/$ \1/
-   P
-   D
- # Note that `D' includes a jump to the start!!
- # We found a continuation line.  But before printing insert '\'.
-   :a
-   s/\(.*\)\(\n.*\)/\1\\\2/
-+# Change escaped quotes into regular quotes.
-+  s/\\*"/"/g
-   P
- # We cannot use the sed command `D' here
-   s/.*\n\(.*\)/\1/
diff --git a/archivers/gtar/patches/patch-ad b/archivers/gtar/patches/patch-ad
deleted file mode 100644
index 8c1d1c54276..00000000000
--- a/archivers/gtar/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.2 1999/09/18 03:36:24 kim Exp $
-
---- configure.orig	Fri Apr 25 16:03:34 1997
-+++ configure	Fri Sep 17 23:08:21 1999
-@@ -4255,7 +4255,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
- fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
-@@ -4509,7 +4509,7 @@
- 		 USE_INCLUDED_LIBINTL=yes
- 		 CATOBJEXT=.cat
- 		 INSTOBJEXT=.cat
--		 DATADIRNAME=lib
-+		 DATADIRNAME=share
- 		 INTLDEPS="../intl/libintl.a"
- 		 INTLLIBS=$INTLDEPS
- 		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
diff --git a/archivers/gtar/patches/patch-ae b/archivers/gtar/patches/patch-ae
deleted file mode 100644
index 65986ff8020..00000000000
--- a/archivers/gtar/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 1999/09/18 03:36:24 kim Exp $
-
---- Makefile.in.orig	Fri Apr 25 20:21:38 1997
-+++ Makefile.in	Fri Sep 17 22:46:37 1999
-@@ -104,7 +104,7 @@
- 
- BABYL = rmail/* admin/*/RMAIL
- EXTRA_DIST = AC-PATCHES AM-PATCHES BI-PATCHES PORTS rebox.el
--SUBDIRS = doc lib intl src scripts po tests
-+SUBDIRS = lib intl src scripts po tests
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- CONFIG_HEADER_IN = config.h.in
- CONFIG_HEADER_FULL = config.h
diff --git a/archivers/gtar/pkg/COMMENT b/archivers/gtar/pkg/COMMENT
index ea986dd2478..d725f97562e 100644
--- a/archivers/gtar/pkg/COMMENT
+++ b/archivers/gtar/pkg/COMMENT
@@ -1 +1 @@
-The GNU tape archiver (tar) with remote magnetic tape (rmt) support.
+The "meta-package" for the GNU tape archiver (tar).
diff --git a/archivers/gtar/pkg/DESCR b/archivers/gtar/pkg/DESCR
index be9f3f0d8fb..1bc4987008f 100644
--- a/archivers/gtar/pkg/DESCR
+++ b/archivers/gtar/pkg/DESCR
@@ -1,5 +1,6 @@
-GNU tar, originally shipped as NetBSD's "tar" up to version 1.3, is a
-full-featured tar command that can access remote and local magnetic tapes,
-tar files (ustar, POSIX, and V7), and even compressed or gzipped versions
-of these.  Note that as of the current version of GNU tar (1.12), gtar
-does not create "correct" ustar archives. 
+GNU tar, is a full-featured tar command that can access remote
+and local magnetic tapes, tar files (ustar, POSIX, and V7), and
+even compressed or gzipped versions of these.
+
+This package provides easy installation of both the actual GNU
+tape archiver and its associated info documentation.
diff --git a/archivers/gtar/pkg/PLIST b/archivers/gtar/pkg/PLIST
index cec21d58677..3c735afc723 100644
--- a/archivers/gtar/pkg/PLIST
+++ b/archivers/gtar/pkg/PLIST
@@ -1,13 +1,2 @@
-@comment $NetBSD: PLIST,v 1.4 1999/09/18 03:36:24 kim Exp $
-bin/gtar
-man/man1/gtar.1
-share/locale/de/LC_MESSAGES/tar.cat
-share/locale/fr/LC_MESSAGES/tar.cat
-share/locale/it/LC_MESSAGES/tar.cat
-share/locale/ko/LC_MESSAGES/tar.cat
-share/locale/nl/LC_MESSAGES/tar.cat
-share/locale/no/LC_MESSAGES/tar.cat
-share/locale/pl/LC_MESSAGES/tar.cat
-share/locale/pt/LC_MESSAGES/tar.cat
-share/locale/sl/LC_MESSAGES/tar.cat
-share/locale/sv/LC_MESSAGES/tar.cat
+@comment $NetBSD: PLIST,v 1.5 1999/09/18 15:23:44 kim Exp $
+@comment this plist intentionally left empty