From 17ae863d25ce831c0bd0cfb0648876b545132457 Mon Sep 17 00:00:00 2001
From: ngie <ngie@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Tue, 24 Mar 2015 06:59:41 +0000
Subject: [PATCH] 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


git-svn-id: svn://svn.freebsd.org/base/stable/10@280420 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 etc/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/Makefile b/etc/Makefile
index 670ac159f..e3c02f650 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -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
-- 
2.45.0