git: 76a612526c84 - main - packages: move ctl{d,stat,adm} to the ctl package

The branch main has been updated by ivy:

URL: https://cgit.FreeBSD.org/src/commit/?id=76a612526c8477188f41825346f99a8382e70543

commit 76a612526c8477188f41825346f99a8382e70543
Author:     Lexi Winter <ivy@FreeBSD.org>
AuthorDate: 2025-05-27 07:17:21 +0000
Commit:     Lexi Winter <ivy@FreeBSD.org>
CommitDate: 2025-05-28 01:16:29 +0000

    packages: move ctl{d,stat,adm} to the ctl package
    
    This leaves the iscsi package for the iSCSI initiator, and the new
    package provides the CAM target layer (including the iSCSI target).
    
    Reviewed by:    manu, des, jhb
    Approved by:    des (mentor)
    Differential Revision:  https://reviews.freebsd.org/D50287
---
 UPDATING                 | 5 +++++
 libexec/rc/rc.d/Makefile | 9 ++++++---
 usr.bin/ctlstat/Makefile | 1 +
 usr.sbin/ctladm/Makefile | 2 +-
 usr.sbin/ctld/Makefile   | 2 +-
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/UPDATING b/UPDATING
index c492082383f8..7efea1207e11 100644
--- a/UPDATING
+++ b/UPDATING
@@ -27,6 +27,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.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".)
 
+20250527:
+	ctld(8), ctladm(8) and ctlstat(8) have moved to the new FreeBSD-ctl
+	package.  If you use pkgbase and you need the CAM Target Layer, you
+	should install the new package.
+
 20250521:
 	Commit e64fe5ad3a23 removed in6_maxmtu and its setter in6_setmaxmtu().
 	in6_maxmtu is used to store the max IPv6 MTU of all interfaces,
diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile
index 67786672351a..d463a0732c52 100644
--- a/libexec/rc/rc.d/Makefile
+++ b/libexec/rc/rc.d/Makefile
@@ -260,10 +260,13 @@ NATDPACKAGE=	natd
 
 .if ${MK_ISCSI} != "no"
 CONFGROUPS+=	ISCSI
-ISCSI=		iscsictl	\
-		iscsid		\
-		ctld
+ISCSI=		iscsictl \
+		iscsid
 ISCSIPACKAGE=	iscsi
+
+CONFGROUPS+=	CTL
+CTL=		ctld
+CTLPACKAGE=	ctl
 .endif
 
 .if ${MK_JAIL} != "no"
diff --git a/usr.bin/ctlstat/Makefile b/usr.bin/ctlstat/Makefile
index aa7c6f2a2641..e1cf3a1f142f 100644
--- a/usr.bin/ctlstat/Makefile
+++ b/usr.bin/ctlstat/Makefile
@@ -1,3 +1,4 @@
+PACKAGE=	ctl
 PROG=		ctlstat
 MAN=		ctlstat.8
 SDIR=		${SRCTOP}/sys
diff --git a/usr.sbin/ctladm/Makefile b/usr.sbin/ctladm/Makefile
index 7d2ec477a4f3..9f9ade18934b 100644
--- a/usr.sbin/ctladm/Makefile
+++ b/usr.sbin/ctladm/Makefile
@@ -1,6 +1,6 @@
 .include <src.opts.mk>
 
-PACKAGE=	iscsi
+PACKAGE=	ctl
 PROG=		ctladm
 SRCS=		ctladm.c util.c ctl_util.c ctl_nvme_all.c ctl_scsi_all.c
 .PATH:		${SRCTOP}/sys/cam/ctl
diff --git a/usr.sbin/ctld/Makefile b/usr.sbin/ctld/Makefile
index 79c69c95fbb1..314554a99b56 100644
--- a/usr.sbin/ctld/Makefile
+++ b/usr.sbin/ctld/Makefile
@@ -3,7 +3,7 @@
 CFLAGS+=-I${SRCTOP}/contrib/libucl/include
 .PATH:  ${SRCTOP}/contrib/libucl/include
 
-PACKAGE=	iscsi
+PACKAGE=	ctl
 PROG_CXX=	ctld
 SRCS=		ctld.cc conf.cc discovery.cc isns.cc kernel.cc
 SRCS+=		login.cc parse.y token.l y.tab.h uclparse.cc