From 5efd371bba1508ed94faed2afbd11936f5fe4dac Mon Sep 17 00:00:00 2001
From: Lexi Winter <ivy@FreeBSD.org>
Date: Tue, 23 Sep 2025 22:05:05 +0100
Subject: [PATCH] packages: Move powerd to its own package

Nearly everyone wants powerd to manage CPU frequency scaling on real
hardware, even if -utilities isn't installed.  Conversely, very small
jails might want -utilities but don't need powerd.

Move it to its own package and add it to the minimal set.

MFC after:	1 day
Reviewed by:	manu, imp
Differential Revision:	https://reviews.freebsd.org/D52645
---
 UPDATING                            |  7 +++++++
 libexec/rc/rc.d/Makefile            |  5 ++++-
 release/packages/ucl/powerd-all.ucl | 11 +++++++++++
 usr.sbin/powerd/Makefile            |  1 +
 4 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 release/packages/ucl/powerd-all.ucl

diff --git a/UPDATING b/UPDATING
index 82ae24814e0..23c2da62db6 100644
--- a/UPDATING
+++ b/UPDATING
@@ -27,6 +27,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 16.x IS SLOW:
 	world, or to merely disable the most expensive debugging functionality
 	at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20250923:
+	powerd has been moved to a new FreeBSD-powerd package.  If you have
+	FreeBSD-set-minimal installed, the new package will be installed
+	automatically, otherwise you may want to install it by hand.
+
+	This only affects pkgbase users.
+
 20250918:
 	mandoc (including /usr/bin/man) has been moved to a new package,
 	FreeBSD-mandoc.  If you have the minimal set installed, this package
diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile
index e5ee34e6218..d072039836d 100644
--- a/libexec/rc/rc.d/Makefile
+++ b/libexec/rc/rc.d/Makefile
@@ -50,7 +50,6 @@ CONFS=	DAEMON \
 	${_nscd} \
 	${_opensm} \
 	os-release \
-	powerd \
 	pppoed \
 	pwcheck \
 	quota \
@@ -127,6 +126,10 @@ CONFGROUPS+=		NEWSYSLOG
 NEWSYSLOG=		newsyslog
 NEWSYSLOGPACKAGE=	newsyslog
 
+CONFGROUPS+=		POWERD
+POWERD=			powerd
+POWERDPACKAGE=		powerd
+
 CONFGROUPS+=		SYSLOGD
 SYSLOGD=		syslogd
 SYSLOGDPACKAGE=		syslogd
diff --git a/release/packages/ucl/powerd-all.ucl b/release/packages/ucl/powerd-all.ucl
new file mode 100644
index 00000000000..b6a2b3034f8
--- /dev/null
+++ b/release/packages/ucl/powerd-all.ucl
@@ -0,0 +1,11 @@
+comment = "System power control utility"
+
+desc = <<EOD
+The powerd utility monitors the system state and sets various power control
+options accordingly.  It offers power-saving modes that can be individually
+selected for operation on AC power or batteries.
+EOD
+
+annotations {
+	set = minimal
+}
diff --git a/usr.sbin/powerd/Makefile b/usr.sbin/powerd/Makefile
index 8a700b014e4..94378576774 100644
--- a/usr.sbin/powerd/Makefile
+++ b/usr.sbin/powerd/Makefile
@@ -1,3 +1,4 @@
+PACKAGE=powerd
 PROG=	powerd
 MAN=	powerd.8