From owner-svn-src-projects@FreeBSD.ORG  Wed Nov 26 02:46:49 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@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 6767DDA5;
 Wed, 26 Nov 2014 02:46:49 +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 54B51E44;
 Wed, 26 Nov 2014 02:46:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQ2kniR046124;
 Wed, 26 Nov 2014 02:46:49 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQ2kmRb046122;
 Wed, 26 Nov 2014 02:46:48 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201411260246.sAQ2kmRb046122@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: Wed, 26 Nov 2014 02:46:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r275098 - in projects/building-blocks: etc/rc.d
 tools/build/mk
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Nov 2014 02:46:49 -0000

Author: ngie
Date: Wed Nov 26 02:46:48 2014
New Revision: 275098
URL: https://svnweb.freebsd.org/changeset/base/275098

Log:
  Only install the accounting/apm rc scripts for MK_ACCT/MK_APM if the relevant
  knobs are set

Modified:
  projects/building-blocks/etc/rc.d/Makefile
  projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc

Modified: projects/building-blocks/etc/rc.d/Makefile
==============================================================================
--- projects/building-blocks/etc/rc.d/Makefile	Wed Nov 26 02:37:00 2014	(r275097)
+++ projects/building-blocks/etc/rc.d/Makefile	Wed Nov 26 02:46:48 2014	(r275098)
@@ -8,12 +8,9 @@ FILES=	DAEMON \
 	NETWORKING \
 	SERVERS \
 	abi \
-	accounting \
 	addswap \
 	adjkerntz \
 	amd \
-	apm \
-	apmd \
 	archdep \
 	atm1 \
 	atm2 \
@@ -164,6 +161,15 @@ FILES=	DAEMON \
 	zfs \
 	zvol
 
+.if ${MK_ACCT} != "no"
+FILES+=	accounting
+.endif
+
+.if ${MK_APM} != "no"
+FILES+=	apm
+FILES+=	apmd
+.endif
+
 .if ${MK_BLUETOOTH} != "no"
 _bluetooth=	bluetooth
 _bthidd=	bthidd

Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc	Wed Nov 26 02:37:00 2014	(r275097)
+++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc	Wed Nov 26 02:46:48 2014	(r275098)
@@ -6,6 +6,7 @@
 #
 
 .if ${MK_ACCT} == no
+OLD_FILES+=etc/rc.d/accounting
 OLD_FILES+=etc/periodic/daily/310.accounting
 OLD_FILES+=usr/sbin/accton
 OLD_FILES+=usr/sbin/sa
@@ -48,6 +49,8 @@ OLD_FILES+=usr/share/man/man8/wire-test.
 .endif
 
 .if ${MK_APM} == no
+OLD_FILES+=etc/rc.d/apm
+OLD_FILES+=etc/rc.d/apmd
 OLD_FILES+=etc/apmd.conf
 OLD_FILES+=usr/sbin/apm
 OLD_FILES+=usr/share/examples/etc/apmd.conf