From 7fd9237bebb54eda6fd3012839fba3cffcbea5ad Mon Sep 17 00:00:00 2001
From: ngie <ngie@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Thu, 5 Feb 2015 10:50:51 +0000
Subject: [PATCH] MFC r277730:

r277730:

  Honor MK_ACPI in etc/devd and etc/rc.d

  Sponsored by: EMC / Isilon Storage Division


git-svn-id: svn://svn.freebsd.org/base/stable/9@278247 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 etc/devd/Makefile                        | 4 ++++
 etc/rc.d/Makefile                        | 5 ++++-
 tools/build/mk/OptionalObsoleteFiles.inc | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/etc/devd/Makefile b/etc/devd/Makefile
index 46ab16c73..baee06e2e 100644
--- a/etc/devd/Makefile
+++ b/etc/devd/Makefile
@@ -2,13 +2,17 @@
 
 .include <bsd.own.mk>
 
+FILES=
+
 .if ${MACHINE} == "powerpc"
 FILES+=	apple.conf
 .endif
 
 .if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
+.if ${MK_ACPI} != "no"
 FILES+=	asus.conf
 .endif
+.endif
 
 .if ${MK_USB} != "no"
 FILES+=	uath.conf usb.conf
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index ed7d4848b..e2cc352ac 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -101,7 +101,6 @@ FILES=	DAEMON \
 	pflog \
 	pfsync \
 	powerd \
-	power_profile \
 	ppp \
 	pppoed \
 	pwcheck \
@@ -154,6 +153,10 @@ FILES=	DAEMON \
 FILES+=		amd
 .endif
 
+.if ${MK_ACPI} != "no"
+FILES+=		power_profile
+.endif
+
 .if ${MK_APM} != "no"
 FILES+=	apm
 FILES+=	apmd
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 932d9ecf3..ca126bfec 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -14,6 +14,8 @@ OLD_FILES+=usr/share/man/man8/sa.8.gz
 .endif
 
 .if ${MK_ACPI} == no
+OLD_FILES+=etc/devd/asus.conf
+OLD_FILES+=etc/rc.d/power_profile
 OLD_FILES+=usr/sbin/acpiconf
 OLD_FILES+=usr/sbin/acpidb
 OLD_FILES+=usr/sbin/acpidump
-- 
2.45.0