git: 351bf9563a93 - stable/15 - share/man/man[49]: Set PACKAGE=kernel-man

The branch stable/15 has been updated by ivy:

URL: https://cgit.FreeBSD.org/src/commit/?id=351bf9563a931045d55f121cc55ddfe65eb1219c

commit 351bf9563a931045d55f121cc55ddfe65eb1219c
Author:     Lexi Winter <ivy@FreeBSD.org>
AuthorDate: 2025-09-15 18:22:09 +0000
Commit:     Lexi Winter <ivy@FreeBSD.org>
CommitDate: 2025-09-19 01:17:28 +0000

    share/man/man[49]: Set PACKAGE=kernel-man
    
    When MANSPLITPKG is disabled (which is now the default), the kernel
    manpages in sections 4 and 9 are installed in the -kernel package
    instead of the -kernel-man package, because bsd.man.mk doesn't add
    the -man suffix.
    
    Since we already have handling for kernel-man in generate-ucl.lua,
    set PACKAGE=kernel-man to make sure they're always in the right
    package.
    
    To avoid creating -kernel-man-man when WITH_MANSPLITPKG is enabled,
    add some logic to bsd.man.mk (suggested by kevans) to avoid adding
    the -man suffix if the package already has a -man suffix, and while
    here, ensure ${__group}PACKAGE is always defined.
    
    MFC after:      3 seconds
    Reviewed by:    des, bapt
    Differential Revision:  https://reviews.freebsd.org/D52525
    
    (cherry picked from commit 6d83ae143b1f598b5f8868508f6e8a7d3440f568)
---
 share/man/man4/Makefile | 2 +-
 share/man/man9/Makefile | 2 +-
 share/mk/bsd.man.mk     | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index c454a696f112..f5d7a0e081fc 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,7 +1,7 @@
 .include <src.opts.mk>
 
 MANGROUPS=	MAN
-MANPACKAGE=	kernel
+MANPACKAGE=	kernel-man
 
 # If you add a new file here, please consider adding an entry to the
 # hardware notes template (website/archetypes/release/hardware.adoc in
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index 5bcde3030ebc..30f41073bcbf 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -1,6 +1,6 @@
 .include <src.opts.mk>
 
-PACKAGE=	kernel
+PACKAGE=	kernel-man
 
 MAN=	accept_filter.9 \
 	accf_data.9 \
diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
index a2c34eff9e3e..0a3594e05d94 100644
--- a/share/mk/bsd.man.mk
+++ b/share/mk/bsd.man.mk
@@ -105,15 +105,16 @@ manlinksinstall: manlinksinstall-${__group}
 ${__group}OWN?=		${MANOWN}
 ${__group}GRP?=		${MANGRP}
 ${__group}MODE?=	${MANMODE}
+${__group}PACKAGE?=	${PACKAGE:Uutilities}
 
 # Tag processing is only done for NO_ROOT installs.
 .if defined(NO_ROOT)
 
 .if !defined(${__group}TAGS) || ! ${${__group}TAGS:Mpackage=*}
-.if ${MK_MANSPLITPKG} == "no"
-${__group}TAGS+=	package=${${__group}PACKAGE:U${PACKAGE:Uutilities}}
+.if ${MK_MANSPLITPKG} == "no" || ${${__group}PACKAGE:M*-man}
+${__group}TAGS+=	package=${${__group}PACKAGE}
 .else
-${__group}TAGS+=	package=${${__group}PACKAGE:U${PACKAGE:Uutilities}}-man
+${__group}TAGS+=	package=${${__group}PACKAGE}-man
 .endif
 .endif