From ff2a6cddc915bcc9220ec26fb8bb350d2b85f1ec Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Thu, 21 Jan 2016 18:41:55 +0000
Subject: [PATCH] Create a package for apm(8).

Sponsored by:	The FreeBSD Foundation
---
 etc/rc.d/Makefile              |  9 +++++++--
 release/packages/apm-debug.ucl | 13 +++++++++++++
 release/packages/apm.ucl       | 13 +++++++++++++
 usr.sbin/apm/Makefile          |  2 ++
 usr.sbin/apmd/Makefile         |  2 ++
 5 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 release/packages/apm-debug.ucl
 create mode 100644 release/packages/apm.ucl

diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index 1f658aad875b..192971822ce1 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -154,8 +154,9 @@ AMD+=		amd
 .endif
 
 .if ${MK_APM} != "no"
-FILES+=	apm
-FILES+=	apmd
+FILESGROUPS+=	APM
+APM+=		apm
+APM+=		apmd
 .endif
 
 .if ${MK_AUTOFS} != "no"
@@ -322,4 +323,8 @@ ACCTDIR=	/etc/rc.d
 ACCTMODE=	${BINMODE}
 ACCTPACKAGE=	acct
 
+APMDIR=		/etc/rc.d
+APMMODE=	${BINMODE}
+APMPACKAGE=	apm
+
 .include <bsd.prog.mk>
diff --git a/release/packages/apm-debug.ucl b/release/packages/apm-debug.ucl
new file mode 100644
index 000000000000..2cb275b6a676
--- /dev/null
+++ b/release/packages/apm-debug.ucl
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "Advanced Power Management Utilities (debugging symbols)"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
diff --git a/release/packages/apm.ucl b/release/packages/apm.ucl
new file mode 100644
index 000000000000..660ecff70eaf
--- /dev/null
+++ b/release/packages/apm.ucl
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "Advanced Power Management Utilities"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "https://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile
index 3cc6f5042ea9..f52453c62522 100644
--- a/usr.sbin/apm/Makefile
+++ b/usr.sbin/apm/Makefile
@@ -5,4 +5,6 @@ MAN=	apm.8
 MLINKS=	apm.8 apmconf.8
 MANSUBDIR= /${MACHINE_CPUARCH}
 
+PACKAGE=apm
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/apmd/Makefile b/usr.sbin/apmd/Makefile
index b2afdfaf78d1..20a4e5620ee7 100644
--- a/usr.sbin/apmd/Makefile
+++ b/usr.sbin/apmd/Makefile
@@ -5,6 +5,8 @@ MAN=	apmd.8
 MANSUBDIR= /i386
 SRCS=	apmd.c apmdlex.l apmdparse.y y.tab.h
 
+PACKAGE=apm
+
 WARNS?=	3
 
 LIBADD=	l