From owner-svn-src-head@FreeBSD.ORG  Tue May 10 10:48:44 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1238E1065678;
	Tue, 10 May 2011 10:48:44 +0000 (UTC) (envelope-from ru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0311F8FC18;
	Tue, 10 May 2011 10:48:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4AAmhnG040879;
	Tue, 10 May 2011 10:48:43 GMT (envelope-from ru@svn.freebsd.org)
Received: (from ru@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4AAmht1040877;
	Tue, 10 May 2011 10:48:43 GMT (envelope-from ru@svn.freebsd.org)
Message-Id: <201105101048.p4AAmht1040877@svn.freebsd.org>
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Tue, 10 May 2011 10:48:43 +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: r221726 - head/share/mk
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 May 2011 10:48:44 -0000

Author: ru
Date: Tue May 10 10:48:43 2011
New Revision: 221726
URL: http://svn.freebsd.org/changeset/base/221726

Log:
  Another fallout from r220359: MK_GNU_CPIO was mistakenly re-added
  after being removed in r205702.  Remove it again.

Modified:
  head/share/mk/bsd.own.mk

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Tue May 10 07:12:11 2011	(r221725)
+++ head/share/mk/bsd.own.mk	Tue May 10 10:48:43 2011	(r221726)
@@ -394,7 +394,6 @@ __DEFAULT_NO_OPTIONS = \
     BIND_LIBS \
     BIND_SIGCHASE \
     BIND_XML \
-    GNU_CPIO \
     HESIOD \
     ICONV \
     IDEA \
@@ -405,7 +404,7 @@ __DEFAULT_NO_OPTIONS = \
 # this means that we have to test TARGET_ARCH (the buildworld case) as well
 # as MACHINE_ARCH (the non-buildworld case).  Normally TARGET_ARCH is not
 # used at all in bsd.*.mk, but we have to make an exception here if we want
-# to allow defaults for some things like clang and ftd to vary by target
+# to allow defaults for some things like clang and fdt to vary by target
 # architecture.
 #
 .if defined(TARGET_ARCH)