From owner-svn-src-all@FreeBSD.ORG Fri Jun 17 20:47:44 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E6C73106566C; Fri, 17 Jun 2011 20:47:44 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BCAEC8FC08; Fri, 17 Jun 2011 20:47:44 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5HKli06006340; Fri, 17 Jun 2011 20:47:44 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5HKli7L006335; Fri, 17 Jun 2011 20:47:44 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201106172047.p5HKli7L006335@svn.freebsd.org> From: Ed Schouten Date: Fri, 17 Jun 2011 20:47:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r223201 - in head: etc/periodic/monthly tools/build/mk tools/build/options usr.sbin X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jun 2011 20:47:45 -0000 Author: ed Date: Fri Jun 17 20:47:44 2011 New Revision: 223201 URL: http://svn.freebsd.org/changeset/base/223201 Log: Don't omit ac(8) as part of WITHOUT_ACCT. The WITHOUT_ACCT switch is supposed to omit tools related to process accounting, namely accton and sa. ac(8) is just a simple tool that prints statistics based on data in the utx.log database. It has nothing to do with the former. Modified: head/etc/periodic/monthly/Makefile head/tools/build/mk/OptionalObsoleteFiles.inc head/tools/build/options/WITHOUT_ACCT head/usr.sbin/Makefile Modified: head/etc/periodic/monthly/Makefile ============================================================================== --- head/etc/periodic/monthly/Makefile Fri Jun 17 20:19:11 2011 (r223200) +++ head/etc/periodic/monthly/Makefile Fri Jun 17 20:47:44 2011 (r223201) @@ -2,12 +2,7 @@ .include -FILES= 999.local - -# NB: keep these sorted by MK_* knobs - -.if ${MK_ACCT} != "no" -FILES+= 200.accounting -.endif +FILES= 200.accounting \ + 999.local .include Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Fri Jun 17 20:19:11 2011 (r223200) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Fri Jun 17 20:47:44 2011 (r223201) @@ -8,10 +8,8 @@ .if ${MK_ACCT} == no OLD_FILES+=etc/periodic/daily/310.accounting OLD_FILES+=etc/periodic/monthly/200.accounting -OLD_FILES+=usr/sbin/ac OLD_FILES+=usr/sbin/accton OLD_FILES+=usr/sbin/sa -OLD_FILES+=usr/share/man/man8/ac.8.gz OLD_FILES+=usr/share/man/man8/accton.8.gz OLD_FILES+=usr/share/man/man8/sa.8.gz .endif Modified: head/tools/build/options/WITHOUT_ACCT ============================================================================== --- head/tools/build/options/WITHOUT_ACCT Fri Jun 17 20:19:11 2011 (r223200) +++ head/tools/build/options/WITHOUT_ACCT Fri Jun 17 20:47:44 2011 (r223201) @@ -1,5 +1,5 @@ .\" $FreeBSD$ Set to not build process accounting tools such as -.Xr ac 8 +.Xr accton 8 and -.Xr accton 8 . +.Xr sa 8 . Modified: head/usr.sbin/Makefile ============================================================================== --- head/usr.sbin/Makefile Fri Jun 17 20:19:11 2011 (r223200) +++ head/usr.sbin/Makefile Fri Jun 17 20:47:44 2011 (r223201) @@ -3,7 +3,8 @@ .include -SUBDIR= adduser \ +SUBDIR= ac \ + adduser \ arp \ bootparamd \ burncd \ @@ -99,7 +100,6 @@ SUBDIR= adduser \ # NB: keep these sorted by MK_* knobs .if ${MK_ACCT} != "no" -SUBDIR+= ac SUBDIR+= accton SUBDIR+= sa .endif