From nobody Fri Sep 19 01:19:55 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cSZRw2t5tz68LMG; Fri, 19 Sep 2025 01:19:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cSZRw0DPFz49cH; Fri, 19 Sep 2025 01:19:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758244796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=obC6EPX9ZGeNrQyCimYzb530IM6ai9yI/t41SACg6NA=; b=EjdoG7hCftaSsluHaqVaWh1742vaFqh0bQAWd3aOVcc5UNocGck+R0jNVulmdukAP7OEOC CrD+Hl9AoUBi8h4886+pc4f9rR+J6k89JcS6OjLL7/pxGSMcp+QQxvZS2qlJLRjtSZHipg mCrRUso+QesYhvXhJSTD8iUlOz/4mxudnTNl0EEqYFkPhWKx0Df3Hruowf6w8GS+/Q3nsi DbxGNthVaep/SIiRDZY2pQTLwkLAG19+7OAxFubNSzzVrf7dNgh3qbu31FER9JcHzYa+aK E2kFeMUbzuQF1gVnIn+HG76tHvzgd4j66FMfCr9i7NKzkVKzLAvQx9Oi3jI3Pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758244796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=obC6EPX9ZGeNrQyCimYzb530IM6ai9yI/t41SACg6NA=; b=PtI2VNwXP1H5Nof4i3a4GLADtCe3DF5+yiK4Ytpv6PvGvLROysa4JdZl/CYkXGLk6dRgRh hwn17jbMgamithZre0/lrShopkuo0f2dWUVYZbpsVGkEqDGpwTnEUZxfpGQTfape7MNrjG Uq67+OilaGjQQb1Fu8b7PhAugMvkfBBOHlFE3F/qwNf+HmHhEbk7Xa8wg+BNftnnwQLZWN sicb4wB6uB821lBLYld2SnW+w7Hjq12njsltZoxV7w/25z3tJeBU2C3IsHp+RnJZpblOOp NamhQlyUd8+ISx9O6WCHT46DN67iuX5YKrWV2bgxhH14dnyih1Ij6Meu78K4Dg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758244796; a=rsa-sha256; cv=none; b=kbMKbqJ4ZBwGKyQpVnoxL8o7n3fncaWbwb4UGc6P5IS6E8kcXBMn9DTT00MsxZhiLdeqGY 5kHV/h7d4JyVFd3EGEuK4l6X92dOaHHX8p2FNFcAQV74GvYC3E5uxBF81i59E7RNIMg6hJ Ar9YPTqLPMl+FZ97dlaDHB67y/7raNMUDbi2WOGAjSI65GphX+NS2oo3VspVQf+XAlF+zd fwGMSEMmQE2KWFJ2UnuLN5XUFFhyP85q9ooYquhWyZvTGNlGAgI7/UVxOTkF/8qfl/8dvP FS7RAzQT9/isL08ZBKuFeyoYN8noNLdWhBkBOCV93gRifF6SPvzFZsuBEGDLhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cSZRv6P1MzcFT; Fri, 19 Sep 2025 01:19:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58J1JtCh067160; Fri, 19 Sep 2025 01:19:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58J1Jtcr067157; Fri, 19 Sep 2025 01:19:55 GMT (envelope-from git) Date: Fri, 19 Sep 2025 01:19:55 GMT Message-Id: <202509190119.58J1Jtcr067157@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 351bf9563a93 - stable/15 - share/man/man[49]: Set PACKAGE=kernel-man List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 351bf9563a931045d55f121cc55ddfe65eb1219c Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=351bf9563a931045d55f121cc55ddfe65eb1219c commit 351bf9563a931045d55f121cc55ddfe65eb1219c Author: Lexi Winter AuthorDate: 2025-09-15 18:22:09 +0000 Commit: Lexi Winter 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 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 -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