svn commit: r295004 - in projects/release-pkg/etc: periodic/daily periodic/monthly rc.d

[Glen Barber]

Author: gjb
Date: Thu Jan 28 18:44:31 2016
New Revision: 295004
URL: https://svnweb.freebsd.org/changeset/base/295004

Log:
  Fix accounting package rc.d/accounting conflict.
  
  Add periodic(8) accounting scripts to acct package.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-pkg/etc/periodic/daily/Makefile
  projects/release-pkg/etc/periodic/monthly/Makefile
  projects/release-pkg/etc/rc.d/Makefile

Modified: projects/release-pkg/etc/periodic/daily/Makefile
==============================================================================
--- projects/release-pkg/etc/periodic/daily/Makefile	Thu Jan 28 18:44:11 2016	(r295003)
+++ projects/release-pkg/etc/periodic/daily/Makefile	Thu Jan 28 18:44:31 2016	(r295004)
@@ -2,6 +2,8 @@
 
 .include <src.opts.mk>
 
+FILESGROUPS=FILES
+
 FILES=	100.clean-disks \
 	110.clean-tmps \
 	120.clean-preserve \
@@ -23,8 +25,12 @@ FILES=	100.clean-disks \
 # NB: keep these sorted by MK_* knobs
 
 .if ${MK_ACCT} != "no"
-FILES+=	310.accounting
+FILESGROUPS+=	ACCT
+ACCT+=		310.accounting
 .endif
+ACCTDIR=	/etc/periodic/daily
+ACCTMODE=	${BINMODE}
+ACCTPACKAGE=	acct
 
 .if ${MK_CALENDAR} != "no"
 FILES+=	300.calendar

Modified: projects/release-pkg/etc/periodic/monthly/Makefile
==============================================================================
--- projects/release-pkg/etc/periodic/monthly/Makefile	Thu Jan 28 18:44:11 2016	(r295003)
+++ projects/release-pkg/etc/periodic/monthly/Makefile	Thu Jan 28 18:44:31 2016	(r295004)
@@ -2,13 +2,19 @@
 
 .include <src.opts.mk>
 
+FILESGROUPS=FILES
+
 FILES=	450.status-security \
 	999.local
 
 # NB: keep these sorted by MK_* knobs
 
 .if ${MK_UTMPX} != "no"
-FILES+=	200.accounting
+FILESGROUPS+=	ACCT
+ACCT+=		200.accounting
 .endif
+ACCTDIR=	/etc/periodic/monthly
+ACCTMODE=	${BINMODE}
+ACCTPACKAGE=	acct
 
 .include <bsd.prog.mk>

Modified: projects/release-pkg/etc/rc.d/Makefile
==============================================================================
--- projects/release-pkg/etc/rc.d/Makefile	Thu Jan 28 18:44:11 2016	(r295003)
+++ projects/release-pkg/etc/rc.d/Makefile	Thu Jan 28 18:44:31 2016	(r295004)
@@ -10,7 +10,6 @@ FILES=	DAEMON \
 	NETWORKING \
 	SERVERS \
 	abi \
-	accounting \
 	addswap \
 	adjkerntz \
 	archdep \