From owner-svn-src-projects@FreeBSD.ORG  Thu Mar  5 16:22:33 2015
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 5FD604B8;
 Thu,  5 Mar 2015 16:22:33 +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 40D8EB9;
 Thu,  5 Mar 2015 16:22:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t25GMXJ3036809;
 Thu, 5 Mar 2015 16:22:33 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t25GMWQJ036802;
 Thu, 5 Mar 2015 16:22:32 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201503051622.t25GMWQJ036802@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 5 Mar 2015 16:22:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r279661 - in projects/release-pkg: etc/devd etc/rc.d
 release/packages/acpi usr.sbin/acpi
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: Thu, 05 Mar 2015 16:22:33 -0000

Author: bapt
Date: Thu Mar  5 16:22:31 2015
New Revision: 279661
URL: https://svnweb.freebsd.org/changeset/base/279661

Log:
  Make acpi an individual package
  
  Flag /etc/devd/asus.conf as a config file so it will be automatically merged on updates

Added:
  projects/release-pkg/release/packages/acpi/
  projects/release-pkg/release/packages/acpi/+MANIFEST
Modified:
  projects/release-pkg/etc/devd/Makefile
  projects/release-pkg/etc/rc.d/Makefile
  projects/release-pkg/usr.sbin/acpi/Makefile.inc

Modified: projects/release-pkg/etc/devd/Makefile
==============================================================================
--- projects/release-pkg/etc/devd/Makefile	Thu Mar  5 16:20:53 2015	(r279660)
+++ projects/release-pkg/etc/devd/Makefile	Thu Mar  5 16:22:31 2015	(r279661)
@@ -2,7 +2,7 @@
 
 .include <src.opts.mk>
 
-FILES=
+FILEGROUPS=	FILES
 
 .if ${MACHINE} == "powerpc"
 FILES+=	apple.conf
@@ -10,7 +10,12 @@ FILES+=	apple.conf
 
 .if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
 .if ${MK_ACPI} != "no"
-FILES+=	asus.conf
+FILESGROUPS+=	ACPI
+ACPI=	asus.conf
+ACPIPACKAGE=	acpi
+ACPIDIR=	/etc/devd
+ACPITAGS=	config
+ACPIMODE=	644
 .endif
 .if ${MK_HYPERV} != "no"
 FILES+=	hyperv.conf

Modified: projects/release-pkg/etc/rc.d/Makefile
==============================================================================
--- projects/release-pkg/etc/rc.d/Makefile	Thu Mar  5 16:20:53 2015	(r279660)
+++ projects/release-pkg/etc/rc.d/Makefile	Thu Mar  5 16:22:31 2015	(r279661)
@@ -140,7 +140,8 @@ FILES+=		accounting
 .endif
 
 .if ${MK_ACPI} != "no"
-FILES+=		power_profile
+FILESGROUPS+=	ACPI
+ACPI=		power_profile
 .endif
 
 .if ${MK_ACPI} != "no" || ${MK_APM} != "no"
@@ -293,4 +294,8 @@ UNBOUNDDIR=	/etc/rc.d
 UNBOUNDMODE=	${BINMODE}
 UNBOUNDPACKAGE=	unbound
 
+ACPIDIR=	/etc/rc.d
+ACPIMODE=	${BINMODE}
+ACPIPACKAGE=	acpi
+
 .include <bsd.prog.mk>

Added: projects/release-pkg/release/packages/acpi/+MANIFEST
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/release/packages/acpi/+MANIFEST	Thu Mar  5 16:22:31 2015	(r279661)
@@ -0,0 +1,13 @@
+name = "FreeBSD-acpi"
+origin = "base"
+version = "%VERSION%"
+comment = "ACPI tools"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "http://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+TODO
+EOD

Modified: projects/release-pkg/usr.sbin/acpi/Makefile.inc
==============================================================================
--- projects/release-pkg/usr.sbin/acpi/Makefile.inc	Thu Mar  5 16:20:53 2015	(r279660)
+++ projects/release-pkg/usr.sbin/acpi/Makefile.inc	Thu Mar  5 16:22:31 2015	(r279661)
@@ -4,6 +4,8 @@
 ACPICA_DIR= ${.CURDIR}/../../../sys/contrib/dev/acpica
 CFLAGS+= -I${.CURDIR}/../../../sys
 
+PACKAGE=	acpi
+
 .if exists(${.CURDIR}/../../Makefile.inc)
 .include "${.CURDIR}/../../Makefile.inc"
 .endif