svn commit: r298140 - in head/etc: . devd

[Glen Barber]

Author: gjb
Date: Sun Apr 17 03:45:45 2016
New Revision: 298140
URL: https://svnweb.freebsd.org/changeset/base/298140

Log:
  Fix etcupdate(8) with rc.sendmail and devd/*.  It turns out
  BIN1 and such in etc/* cannot use FILESGROUPS.
  
  Reported by:	peter
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/etc/Makefile
  head/etc/devd/Makefile

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Sun Apr 17 02:51:04 2016	(r298139)
+++ head/etc/Makefile	Sun Apr 17 03:45:45 2016	(r298140)
@@ -83,13 +83,8 @@ BIN1+= apmd.conf
 .endif
 
 .if ${MK_AUTOFS} != "no"
-FILESGROUPS+=	AUTOFS
-AUTOFS+=	auto_master
+BIN1+=	auto_master
 .endif
-AUTOFSDIR=	/etc
-AUTOFSMODE=	${BINMODE}
-AUTOFSPACKAGE=	autofs
-AUTOFSTAGS=	config
 
 .if ${MK_FREEBSD_UPDATE} != "no"
 BIN1+= freebsd-update.conf
@@ -141,12 +136,8 @@ BIN1+= pf.os
 .endif
 
 .if ${MK_SENDMAIL} != "no"
-FILESGROUPS+=	SENDMAILRC
-SENDMAILRC=	rc.sendmail
+BIN1+=	rc.sendmail
 .endif
-SENDMAILRCDIR=	/etc
-SENDMAILRCMODE=	${BINMODE}
-SENDMAILRCPACKAGE=sendmail
 
 .if ${MK_TCSH} != "no"
 BIN1+= csh.cshrc csh.login csh.logout

Modified: head/etc/devd/Makefile
==============================================================================
--- head/etc/devd/Makefile	Sun Apr 17 02:51:04 2016	(r298139)
+++ head/etc/devd/Makefile	Sun Apr 17 03:45:45 2016	(r298140)
@@ -10,12 +10,7 @@ FILES+=	apple.conf
 
 .if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
 .if ${MK_ACPI} != "no"
-FILESGROUPS+=	ACPI
-ACPI=	asus.conf
-ACPIPACKAGE=	acpi
-ACPIDIR=	/etc/devd
-ACPITAGS=	config
-ACPIMODE=	644
+FILES+=	asus.conf
 .endif
 .if ${MK_HYPERV} != "no"
 FILES+=	hyperv.conf