From owner-svn-src-all@freebsd.org  Sun Apr 17 03:45:46 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 80170AED5E1;
 Sun, 17 Apr 2016 03:45:46 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5298F1950;
 Sun, 17 Apr 2016 03:45:46 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3H3jjnt051729;
 Sun, 17 Apr 2016 03:45:45 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3H3jjro051727;
 Sun, 17 Apr 2016 03:45:45 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201604170345.u3H3jjro051727@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Sun, 17 Apr 2016 03:45:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298140 - in head/etc: . devd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Apr 2016 03:45:46 -0000

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