From owner-svn-src-all@FreeBSD.ORG  Sat Feb  6 20:06:07 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 2C56810656A4;
	Sat,  6 Feb 2010 20:06:07 +0000 (UTC)
	(envelope-from antoine@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1516D8FC1C;
	Sat,  6 Feb 2010 20:06:07 +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 o16K66Bc025454;
	Sat, 6 Feb 2010 20:06:06 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o16K66g5025452;
	Sat, 6 Feb 2010 20:06:06 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201002062006.o16K66g5025452@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Sat, 6 Feb 2010 20:06:06 +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: r203563 - head/tools/build/mk
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: Sat, 06 Feb 2010 20:06:07 -0000

Author: antoine
Date: Sat Feb  6 20:06:06 2010
New Revision: 203563
URL: http://svn.freebsd.org/changeset/base/203563

Log:
  Move rescue/ping6 from files to remove when MK_INET6=no to file to remove
  when MK_INET6_SUPPORT=no.  (MK_INET6=no implies MK_INET6_SUPPORT=no)

Modified:
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Sat Feb  6 20:02:56 2010	(r203562)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Sat Feb  6 20:06:06 2010	(r203563)
@@ -899,7 +899,6 @@ OLD_FILES+=usr/include/openssl/idea.h
 .endif
 
 .if ${MK_INET6} == no
-OLD_FILES+=rescue/ping6
 OLD_FILES+=sbin/ping6
 OLD_FILES+=sbin/rtsol
 OLD_FILES+=usr/sbin/faithd
@@ -927,6 +926,10 @@ OLD_FILES+=usr/share/man/man8/rtsold.8.g
 OLD_FILES+=usr/share/man/man8/traceroute6.8.gz
 .endif
 
+.if ${MK_INET6_SUPPORT} == no
+OLD_FILES+=rescue/ping6
+.endif
+
 #.if ${MK_INFO} == no
 # to be filled in
 #.endif