From owner-svn-src-stable-9@FreeBSD.ORG Wed Feb 4 19:40:32 2015 Return-Path: Delivered-To: svn-src-stable-9@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 31B6C50C; Wed, 4 Feb 2015 19:40:32 +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 03C95A7B; Wed, 4 Feb 2015 19:40:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t14JeVNn018231; Wed, 4 Feb 2015 19:40:31 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t14JeVAP018229; Wed, 4 Feb 2015 19:40:31 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201502041940.t14JeVAP018229@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 4 Feb 2015 19:40:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r278219 - in stable/9: etc/rc.d tools/build/mk X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 19:40:32 -0000 Author: ngie Date: Wed Feb 4 19:40:30 2015 New Revision: 278219 URL: https://svnweb.freebsd.org/changeset/base/278219 Log: MFC r277732,r277733: r277732: Honor MK_API in etc/rc.d Sponsored by: EMC / Isilon Storage Division r277733: Honor MK_AMD with etc/rc.d/amd Sponsored by: EMC / Isilon Storage Division Modified: stable/9/etc/rc.d/Makefile stable/9/tools/build/mk/OptionalObsoleteFiles.inc Directory Properties: stable/9/ (props changed) stable/9/etc/ (props changed) stable/9/etc/rc.d/ (props changed) stable/9/tools/ (props changed) stable/9/tools/build/ (props changed) Modified: stable/9/etc/rc.d/Makefile ============================================================================== --- stable/9/etc/rc.d/Makefile Wed Feb 4 18:58:09 2015 (r278218) +++ stable/9/etc/rc.d/Makefile Wed Feb 4 19:40:30 2015 (r278219) @@ -11,9 +11,6 @@ FILES= DAEMON \ accounting \ addswap \ adjkerntz \ - amd \ - apm \ - apmd \ archdep \ atm1 \ atm2 \ @@ -155,6 +152,15 @@ FILES= DAEMON \ zfs \ zvol +.if ${MK_AMD} != "no" +FILES+= amd +.endif + +.if ${MK_APM} != "no" +FILES+= apm +FILES+= apmd +.endif + .if ${MK_BSNMP} != "no" FILES+= bsnmpd .endif Modified: stable/9/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/9/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 4 18:58:09 2015 (r278218) +++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 4 19:40:30 2015 (r278219) @@ -26,6 +26,7 @@ OLD_FILES+=usr/share/man/man8/iasl.8.gz .if ${MK_AMD} == no OLD_FILES+=etc/amd.map +OLD_FILES+=etc/rc.d/amd OLD_FILES+=usr/bin/pawd OLD_FILES+=usr/sbin/amd OLD_FILES+=usr/sbin/amq @@ -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