summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2015-03-05 16:22:31 +0000
committerbapt <bapt@FreeBSD.org>2015-03-05 16:22:31 +0000
commit5bd9a0b317c62f13b5decc06ca87d0ad511f37df (patch)
tree75f1f6052848fe51100eb9e7b00a1f0b3aa09a32
parent427b397417ca7b8af7608de868215a665ed4e128 (diff)
downloadFreeBSD-src-5bd9a0b317c62f13b5decc06ca87d0ad511f37df.zip
FreeBSD-src-5bd9a0b317c62f13b5decc06ca87d0ad511f37df.tar.gz
Make acpi an individual package
Flag /etc/devd/asus.conf as a config file so it will be automatically merged on updates
-rw-r--r--etc/devd/Makefile9
-rw-r--r--etc/rc.d/Makefile7
-rw-r--r--release/packages/acpi/+MANIFEST13
-rw-r--r--usr.sbin/acpi/Makefile.inc2
4 files changed, 28 insertions, 3 deletions
diff --git a/etc/devd/Makefile b/etc/devd/Makefile
index a0909af..d031f19 100644
--- a/etc/devd/Makefile
+++ b/etc/devd/Makefile
@@ -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
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index b4f8058..811517f 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -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>
diff --git a/release/packages/acpi/+MANIFEST b/release/packages/acpi/+MANIFEST
new file mode 100644
index 0000000..74a1b7e
--- /dev/null
+++ b/release/packages/acpi/+MANIFEST
@@ -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
diff --git a/usr.sbin/acpi/Makefile.inc b/usr.sbin/acpi/Makefile.inc
index d6ce93b..9692f0a 100644
--- a/usr.sbin/acpi/Makefile.inc
+++ b/usr.sbin/acpi/Makefile.inc
@@ -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
OpenPOWER on IntegriCloud