From 581dfc5cc0ea046c761e84f28e00a4418346cee4 Mon Sep 17 00:00:00 2001
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Wed, 11 Feb 2004 05:44:20 +0000
Subject: [PATCH] GNU tar in the base system is now called "gtar"

"tar" is now just a link to "gtar".

This lays the groundwork for an orderly migration
from GNU tar to some other tar.  (First, we introduce
the new tar program, then we migrate the 'tar' name,
then we remove gtar, with intervals of months between
these steps.)

Approved by:	gordon
---
 gnu/usr.bin/tar/Makefile | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gnu/usr.bin/tar/Makefile b/gnu/usr.bin/tar/Makefile
index f5488215336..172537073a6 100644
--- a/gnu/usr.bin/tar/Makefile
+++ b/gnu/usr.bin/tar/Makefile
@@ -3,7 +3,12 @@
 TARDIR=	${.CURDIR}/../../../contrib/tar
 .PATH: ${TARDIR}/lib ${TARDIR}/src
 
-PROG=	tar
+PROG=	gtar
+
+.if !defined(WITH_BSDTAR)
+LINKS=  ${BINDIR}/gtar ${BINDIR}/tar
+MLINKS= gtar.1 tar.1
+.endif
 
 SUBDIR=	doc
 
@@ -18,4 +23,9 @@ SRCS+=	buffer.c compare.c create.c delete.c extract.c incremen.c list.c \
 
 CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR} -I${TARDIR}/lib -I${TARDIR}/src
 
+# "Rename" tar.1 to gtar.1 so that we can install gtar.1 with
+# tar.1 as an optional link (rather than vice versa)
+gtar.1: tar.1
+	cp $(.CURDIR)/tar.1 $(.TARGET)
+
 .include <bsd.prog.mk>