Author: ngie
Date: Wed Feb 11 09:21:36 2015
New Revision: 278576
URL: https://svnweb.freebsd.org/changeset/base/278576
Log:
MFC r275098,r277736,r277737:
r277736:
Honor MK_ACCT with etc/rc.d/accounting
Sponsored by: EMC / Isilon Storage Division
r277737:
Honor MK_ACCT with etc/pam.d/atrun
Sponsored by: EMC / Isilon Storage Division
Modified:
stable/9/etc/pam.d/Makefile
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/pam.d/ (props changed)
stable/9/etc/rc.d/ (props changed)
stable/9/tools/ (props changed)
stable/9/tools/build/ (props changed)
Modified: stable/9/etc/pam.d/Makefile
==============================================================================
--- stable/9/etc/pam.d/Makefile Wed Feb 11 09:16:51 2015 (r278575)
+++ stable/9/etc/pam.d/Makefile Wed Feb 11 09:21:36 2015 (r278576)
@@ -1,9 +1,10 @@
# $FreeBSD$
+.include <bsd.own.mk>
+
NO_OBJ=
FILES= README \
- atrun \
cron \
ftpd \
imap \
@@ -16,6 +17,10 @@ FILES= README \
telnetd \
xdm
+.if ${MK_AT} != "no"
+FILES+= atrun
+.endif
+
FILESDIR= /etc/pam.d
FILESMODE= 644
FILESMODE_README= 444
Modified: stable/9/etc/rc.d/Makefile
==============================================================================
--- stable/9/etc/rc.d/Makefile Wed Feb 11 09:16:51 2015 (r278575)
+++ stable/9/etc/rc.d/Makefile Wed Feb 11 09:21:36 2015 (r278576)
@@ -8,7 +8,6 @@ FILES= DAEMON \
NETWORKING \
SERVERS \
abi \
- accounting \
addswap \
adjkerntz \
archdep \
@@ -149,6 +148,10 @@ FILES= DAEMON \
zfs \
zvol
+.if ${MK_ACCT} != "no"
+FILES+= accounting
+.endif
+
.if ${MK_AMD} != "no"
FILES+= amd
.endif
Modified: stable/9/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/9/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 11 09:16:51
2015 (r278575)
+++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 11 09:21:36
2015 (r278576)
@@ -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
@@ -61,6 +62,7 @@ OLD_FILES+=usr/share/man/man8/amd64/apmc
.endif
.if ${MK_AT} == no
+OLD_FILES+=etc/pam.d/atrun
OLD_FILES+=usr/bin/at
OLD_FILES+=usr/bin/atq
OLD_FILES+=usr/bin/atrm
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
