From owner-svn-src-projects@FreeBSD.ORG  Tue Dec  2 19:02:40 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 31E18CC5;
 Tue,  2 Dec 2014 19:02:40 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 1E28D302;
 Tue,  2 Dec 2014 19:02:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB2J2dCW085450;
 Tue, 2 Dec 2014 19:02:39 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB2J2dde085445;
 Tue, 2 Dec 2014 19:02:39 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201412021902.sB2J2dde085445@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Tue, 2 Dec 2014 19:02:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r275419 - in projects/building-blocks: etc/devd
 tools/build/mk
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Dec 2014 19:02:40 -0000

Author: ngie
Date: Tue Dec  2 19:02:39 2014
New Revision: 275419
URL: https://svnweb.freebsd.org/changeset/base/275419

Log:
  Only install etc/devd/asus.conf if MK_ACPI == yes

Modified:
  projects/building-blocks/etc/devd/Makefile
  projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc

Modified: projects/building-blocks/etc/devd/Makefile
==============================================================================
--- projects/building-blocks/etc/devd/Makefile	Tue Dec  2 18:37:04 2014	(r275418)
+++ projects/building-blocks/etc/devd/Makefile	Tue Dec  2 19:02:39 2014	(r275419)
@@ -2,12 +2,16 @@
 
 .include <src.opts.mk>
 
+FILES=
+
 .if ${MACHINE} == "powerpc"
 FILES+=	apple.conf
 .endif
 
 .if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
+.if ${MK_ACPI} != "no"
 FILES+=	asus.conf
+.endif
 .if ${MK_HYPERV} != "no"
 FILES+=	hyperv.conf
 .endif

Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc	Tue Dec  2 18:37:04 2014	(r275418)
+++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc	Tue Dec  2 19:02:39 2014	(r275419)
@@ -15,6 +15,7 @@ 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