From b40fde96d2fd5293b0ece5a75095d3a2695c49ee Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Sun, 17 Apr 2016 03:45:45 +0000
Subject: [PATCH] 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
---
 etc/Makefile      | 13 ++-----------
 etc/devd/Makefile |  7 +------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/etc/Makefile b/etc/Makefile
index d7e30c51815f..94c4473dbf1e 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -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
diff --git a/etc/devd/Makefile b/etc/devd/Makefile
index d031f1930a77..4450226545fb 100644
--- a/etc/devd/Makefile
+++ b/etc/devd/Makefile
@@ -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