From owner-svn-src-stable-10@freebsd.org  Wed Jun  8 14:05:09 2016
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id EB9EDB6E9F3;
 Wed,  8 Jun 2016 14:05:09 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BB95F1723;
 Wed,  8 Jun 2016 14:05:09 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u58E58fv052027;
 Wed, 8 Jun 2016 14:05:08 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u58E58U7052026;
 Wed, 8 Jun 2016 14:05:08 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201606081405.u58E58U7052026@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Wed, 8 Jun 2016 14:05:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r301625 - stable/10/tools/build/mk
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Jun 2016 14:05:10 -0000

Author: ngie
Date: Wed Jun  8 14:05:08 2016
New Revision: 301625
URL: https://svnweb.freebsd.org/changeset/base/301625

Log:
  MFC r300937:
  
  Remove the etcupdate tests if MK_RCS == no when "make delete-old" is run
  
  etcupdate is conditionally installed based on MK_RCS != no today

Modified:
  stable/10/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Wed Jun  8 14:02:21 2016	(r301624)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Wed Jun  8 14:05:08 2016	(r301625)
@@ -4166,6 +4166,15 @@ OLD_FILES+=usr/share/man/man1/rcsmerge.1
 OLD_FILES+=usr/share/man/man1/rlog.1.gz
 OLD_FILES+=usr/share/man/man5/rcsfile.5.gz
 OLD_FILES+=usr/share/man/man8/etcupdate.8.gz
+OLD_FILES+=usr/tests/usr.sbin/etcupdate/Kyuafile
+OLD_FILES+=usr/tests/usr.sbin/etcupdate/always_test
+OLD_FILES+=usr/tests/usr.sbin/etcupdate/conflicts_test
+OLD_FILES+=usr/tests/usr.sbin/etcupdate/fbsdid_test
+OLD_FILES+=usr/tests/usr.sbin/etcupdate/ignore_test
+OLD_FILES+=usr/tests/usr.sbin/etcupdate/preworld_test
+OLD_FILES+=usr/tests/usr.sbin/etcupdate/tests_test
+OLD_FILES+=usr/tests/usr.sbin/etcupdate/tzsetup_test
+OLD_DIRS+=usr/tests/usr.sbin/etcupdate
 .endif
 
 #.if ${MK_RESCUE} == no