From owner-svn-src-all@FreeBSD.ORG  Sun Apr 11 01:31:50 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9606F106566B;
	Sun, 11 Apr 2010 01:31:50 +0000 (UTC)
	(envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 854BE8FC0A;
	Sun, 11 Apr 2010 01:31:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3B1VoWd051070;
	Sun, 11 Apr 2010 01:31:50 GMT
	(envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3B1Vonx051067;
	Sun, 11 Apr 2010 01:31:50 GMT
	(envelope-from kientzle@svn.freebsd.org)
Message-Id: <201004110131.o3B1Vonx051067@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Sun, 11 Apr 2010 01:31:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206464 - head/usr.bin/tar
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Apr 2010 01:31:50 -0000

Author: kientzle
Date: Sun Apr 11 01:31:50 2010
New Revision: 206464
URL: http://svn.freebsd.org/changeset/base/206464

Log:
  Remove an unnecessary include and conditionalize some code.

Modified:
  head/usr.bin/tar/bsdtar.c
  head/usr.bin/tar/bsdtar_platform.h

Modified: head/usr.bin/tar/bsdtar.c
==============================================================================
--- head/usr.bin/tar/bsdtar.c	Sun Apr 11 01:30:15 2010	(r206463)
+++ head/usr.bin/tar/bsdtar.c	Sun Apr 11 01:31:50 2010	(r206464)
@@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$");
 
 #include "bsdtar.h"
 #include "err.h"
-#include "matching.h"
 
 /*
  * Per POSIX.1-1988, tar defaults to reading/writing archives to/from
@@ -180,8 +179,10 @@ main(int argc, char **argv)
 
 	time(&now);
 
+#if HAVE_SETLOCALE
 	if (setlocale(LC_ALL, "") == NULL)
 		bsdtar_warnc(0, "Failed to set default locale");
+#endif
 #if defined(HAVE_NL_LANGINFO) && defined(HAVE_D_MD_ORDER)
 	bsdtar->day_first = (*nl_langinfo(D_MD_ORDER) == 'd');
 #endif

Modified: head/usr.bin/tar/bsdtar_platform.h
==============================================================================
--- head/usr.bin/tar/bsdtar_platform.h	Sun Apr 11 01:30:15 2010	(r206463)
+++ head/usr.bin/tar/bsdtar_platform.h	Sun Apr 11 01:31:50 2010	(r206464)
@@ -62,6 +62,10 @@
 #include "archive_entry.h"
 #endif
 
+#ifdef HAVE_LIBACL
+#include <acl/libacl.h>
+#endif
+
 /*
  * Include "dirent.h" (or it's equivalent on several different platforms).
  *