From e69591ddc36897429bc04ffba126fce41cd45764 Mon Sep 17 00:00:00 2001
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Wed, 22 Dec 2004 00:21:28 +0000
Subject: [PATCH] Portability: the included fts.c should now compile on many
 non-FreeBSD systems, including Linux, Solaris, Darwin, etc.

Thanks to: many people who pointed out the same portability problem
---
 usr.bin/tar/Makefile | 2 +-
 usr.bin/tar/fts.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile
index dcc6a4cd696..d0a96964257 100644
--- a/usr.bin/tar/Makefile
+++ b/usr.bin/tar/Makefile
@@ -6,7 +6,7 @@
 #
 
 PROG=	bsdtar
-VERSION=	1.01.015
+VERSION=	1.01.020
 SRCS=	bsdtar.c matching.c read.c util.c write.c
 WARNS?=	6
 DPADD=	${LIBARCHIVE} ${LIBBZ2} ${LIBZ}
diff --git a/usr.bin/tar/fts.c b/usr.bin/tar/fts.c
index 07bf972ca43..69cd39679b2 100644
--- a/usr.bin/tar/fts.c
+++ b/usr.bin/tar/fts.c
@@ -55,7 +55,7 @@ static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
 #include "bsdtar_platform.h" /* bsdtar: need platform-specific definitions. */
 __FBSDID("$FreeBSD$");
 
-#ifdef linux  /* bsdtar: translate certain system calls to Linux names. */
+#ifndef __FreeBSD__  /* bsdtar: Don't use FreeBSD names on non-FreeBSD. */
 #define _open open
 #define _close close
 #define _fstat fstat