git: 47cf7c780a3e - main - move the SunOS r-commands into the rcmds package

The branch main has been updated by ivy:

URL: https://cgit.FreeBSD.org/src/commit/?id=47cf7c780a3ebdd4b2daf2060fbd1598d384e798

commit 47cf7c780a3ebdd4b2daf2060fbd1598d384e798
Author:     Lexi Winter <ivy@FreeBSD.org>
AuthorDate: 2025-05-05 15:20:46 +0000
Commit:     Lexi Winter <ivy@FreeBSD.org>
CommitDate: 2025-05-05 15:39:25 +0000

    move the SunOS r-commands into the rcmds package
    
    rup, rusers and rwall implement the SunOS remote status utilities based
    on RPC.  these are not widely used nowadays and most users won't have
    them enabled, so there's no reason to ship them in the utilities
    packages.
    
    move the command-line utilities and their respective daemons into the
    rcmds package, which already contains the related utilities rwho and
    ruptime.
    
    improve the comment/description of the rcmds package to be more
    informative and mention its new contents.
    
    while here, standardise formatting in the affected Makefiles.
    
    Reviewed by:    manu, imp, des, emaste
    Approved by:    des (mentor)
    Differential Revision:  https://reviews.freebsd.org/D50143
---
 libexec/rpc.rstatd/Makefile       | 7 ++++---
 libexec/rpc.rusersd/Makefile      | 7 ++++---
 libexec/rpc.rwalld/Makefile       | 7 ++++---
 release/packages/Makefile.package | 8 ++++++--
 release/packages/generate-ucl.sh  | 4 ++++
 usr.bin/rup/Makefile              | 1 +
 usr.bin/rusers/Makefile           | 3 ++-
 usr.bin/rwall/Makefile            | 3 ++-
 8 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/libexec/rpc.rstatd/Makefile b/libexec/rpc.rstatd/Makefile
index 1be4bd27c2c0..5572748ddf26 100644
--- a/libexec/rpc.rstatd/Makefile
+++ b/libexec/rpc.rstatd/Makefile
@@ -1,6 +1,7 @@
-PROG =	rpc.rstatd
-SRCS =	rstatd.c rstat_proc.c
-MAN =	rpc.rstatd.8
+PACKAGE= rcmds
+PROG=	rpc.rstatd
+SRCS=	rstatd.c rstat_proc.c
+MAN=	rpc.rstatd.8
 
 LIBADD=	rpcsvc devstat
 
diff --git a/libexec/rpc.rusersd/Makefile b/libexec/rpc.rusersd/Makefile
index 49d155c969b5..f59002e4b5fd 100644
--- a/libexec/rpc.rusersd/Makefile
+++ b/libexec/rpc.rusersd/Makefile
@@ -1,6 +1,7 @@
-PROG =	rpc.rusersd
-SRCS =	rusersd.c rusers_proc.c extern.h
-MAN =	rpc.rusersd.8
+PACKAGE= rcmds
+PROG=	rpc.rusersd
+SRCS=	rusersd.c rusers_proc.c extern.h
+MAN=	rpc.rusersd.8
 
 LIBADD=	rpcsvc
 
diff --git a/libexec/rpc.rwalld/Makefile b/libexec/rpc.rwalld/Makefile
index 38a9646166d0..8d10a91fffd0 100644
--- a/libexec/rpc.rwalld/Makefile
+++ b/libexec/rpc.rwalld/Makefile
@@ -1,6 +1,7 @@
-PROG =	rpc.rwalld
-SRCS =	rwalld.c
-MAN =	rpc.rwalld.8
+PACKAGE= rcmds
+PROG=	rpc.rwalld
+SRCS=	rwalld.c
+MAN=	rpc.rwalld.8
 
 LIBADD=	util
 
diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index b8b200d0966e..4a1e1920b64e 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -136,8 +136,12 @@ periodic_COMMENT=	Periodic Utility
 periodic_DESC=		Periodic Utility
 rc_COMMENT= 		RC Scripts
 rc_DESC= 		RC Scripts
-rcmds_COMMENT= 		Remote Command Utilities
-rcmds_DESC= 		Remote Command Utilities
+rcmds_COMMENT= 		BSD/SunOS remote status commands
+rcmds_DESC=\
+The BSD/SunOS remote status commands, which can be used to query or interact\
+with remote hosts over the network.  This includes the command-line utilities\
+rwho, ruptime, rup, rusers and rwall and the daemons rwhod, rpc.rstatd,\
+rpc.rusersd, and rpc.rwalld.
 rdma_COMMENT=		RDMA Utilities
 rdma_DESC=		RDMA Utilities
 rescue_COMMENT= 	Rescue Utilities
diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh
index b7d6875b3eb1..b7d7bad35023 100755
--- a/release/packages/generate-ucl.sh
+++ b/release/packages/generate-ucl.sh
@@ -43,6 +43,10 @@ main() {
 		periodic)
 			pkgdeps="cron"
 			;;
+		rcmds)
+			# the RPC daemons require rpcbind
+			pkgdeps="utilities"
+			;;
 
 		# -dev packages that have no corresponding non-dev package
 		# as a dependency.
diff --git a/usr.bin/rup/Makefile b/usr.bin/rup/Makefile
index 8cc5dc0f1af0..28558d052be4 100644
--- a/usr.bin/rup/Makefile
+++ b/usr.bin/rup/Makefile
@@ -1,3 +1,4 @@
+PACKAGE= rcmds
 PROG=	rup
 
 LIBADD=	rpcsvc
diff --git a/usr.bin/rusers/Makefile b/usr.bin/rusers/Makefile
index f3b3a8bd7db0..d3f3158d7be1 100644
--- a/usr.bin/rusers/Makefile
+++ b/usr.bin/rusers/Makefile
@@ -1,4 +1,5 @@
-PROG = rusers
+PACKAGE= rcmds
+PROG=	rusers
 
 LIBADD=	rpcsvc
 
diff --git a/usr.bin/rwall/Makefile b/usr.bin/rwall/Makefile
index 88459adb760f..b0902be9cec8 100644
--- a/usr.bin/rwall/Makefile
+++ b/usr.bin/rwall/Makefile
@@ -1,3 +1,4 @@
-PROG = rwall
+PACKAGE= rcmds
+PROG=	rwall
 
 .include <bsd.prog.mk>