From owner-svn-src-stable-10@FreeBSD.ORG  Tue Mar 24 06:59:42 2015
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8BF7C3B0;
 Tue, 24 Mar 2015 06:59:42 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 76CD7648;
 Tue, 24 Mar 2015 06:59:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2O6xgSg084417;
 Tue, 24 Mar 2015 06:59:42 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2O6xg2f084416;
 Tue, 24 Mar 2015 06:59:42 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201503240659.t2O6xg2f084416@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Tue, 24 Mar 2015 06:59:42 +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: r280420 - stable/10/etc
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.18-1
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: Tue, 24 Mar 2015 06:59:42 -0000

Author: ngie
Date: Tue Mar 24 06:59:41 2015
New Revision: 280420
URL: https://svnweb.freebsd.org/changeset/base/280420

Log:
  Forced commit to note that the previous commit to this file included the
  following MFC as well:
  
  MFC 278251:
  
  Honor the following flags for items that can be conditionalized out of the
  build/install without disrupting other dependent services (see r278249, et
  al):
  
  - MK_LOCATE
  - MK_MAN
  - MK_NLS
  - MK_OPENSSL
  - MK_PKGBOOTSTRAP
  - MK_SENDMAIL
  
  Additional flags need to be handled in etc/Makefile, but it requires
  refactoring the relevant scripts in etc/rc.d/*
  
  MFC after: 3 weeks
  Sponsored by: EMC / Isilon Storage Division

Modified:
  stable/10/etc/Makefile

Modified: stable/10/etc/Makefile
==============================================================================
--- stable/10/etc/Makefile	Tue Mar 24 06:55:08 2015	(r280419)
+++ stable/10/etc/Makefile	Tue Mar 24 06:59:41 2015	(r280420)
@@ -52,7 +52,7 @@ BIN1=	crontab \
 	shells \
 	sysctl.conf \
 	syslog.conf \
-	termcap.small
+	termcap.small \
 
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64"
 BIN1+=	libmap32.conf