From nobody Tue Aug 26 20:45:01 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 4cBKRK6yqhz666KK; Tue, 26 Aug 2025 20:45:01 +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 4cBKRK5tx6z3Gcg; Tue, 26 Aug 2025 20:45:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756241101; 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=hOXtjVbUKDnVmZibSwWqU6DEOw1s1jdAoYNp2nTi5aI=; b=Alv9quJ+ax7b9ASX2dUuI6CdMjmp7trYJqKHpDvkcX7O0MLYk5LjA9a7crpkpALz5AELYZ Y0hVZLgthp9WQWpdE3H4/IOGJ3PuPfjRlTMrOWS3tJFW05rZ/qxTw5Ie9Lpv/R+vgSW7Zq VepJOnSpCzlyzzNQnMm1TIggurXysJ2asXQ1He5WOGOHalAa+lvY3hvoAa2Fxpi0HeXcbz ZDJ6KT7SKPSB0mB/jULC+qdwG+PoyjxPwEod57b6us2n30wzJmy3IFwfr5ENBLOCxl7d5f jbyMdAqsYtEmeIN3JuGy9tBnjsqCMAfTnmqvg5j6xlREQTwZmugdz5HuGo5SDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756241101; 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=hOXtjVbUKDnVmZibSwWqU6DEOw1s1jdAoYNp2nTi5aI=; b=A5/BooY+XIyv1BF06KbJHvur2sKG9/CkOLDSYs/AuM0hjCb6k4atWMhLzsJIleYCnEUzfN vVY6Dm8PYzeKtx9EV+uCifaJQBig9AQ/1BuQeg4PbeX23y/fXKj6Q5UdNWfPLn6QRAIlt4 QiprCvhnYD9DzV1itBFzhwBAcom38cqZjjT0RkFuzvPRc+FGKHv4R0wI4aCN1p7Fof9w13 4o6Nohm/amVqRj/iaiPiMWqfu9f0XrLEP/CZ14BFKk6+Az9wW7Nmim7OXqvokBQl+twRrA am7wquDN+KNm6aw+P1Ba8Oe6z2BpvKLR2KOQboahWIE8FBv9u/ol66KGsAHHPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756241101; a=rsa-sha256; cv=none; b=gSK5bONyPtdry0AHr/+Mu/P4veJqrCwIDOm0hE8tnC1cfEKmqj2lTo07Bc/yVOeOvynciX cbHSdm4RIOPbVHeX7jdMrlb4g0z8c9n0h5gyVMCHmvaUP+HmZbHZOjL6ZWwGx9mIApF89T a+ZqgGn7BNx9Xo/3SdiIchHFU3eoJsyXi4jYqmuUcILBb6ZLhZZBILyQZsPIPgkq1xcoA4 9Fi6NL6SGGeF7k1IuNSi2u/m6JbgR/gVYOeE97aeiGtlxmxH/2lr/arjfTADFlhXvILQBK 1r5sxJw/Ag0wWSD2lUfhu+D7TBmDr/M01KfTGDq6/xia4mnhcOS54ZwuFRHH2w== 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 4cBKRK5Thjzssp; Tue, 26 Aug 2025 20:45:01 +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 57QKj1a3075730; Tue, 26 Aug 2025 20:45:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57QKj1Yw075727; Tue, 26 Aug 2025 20:45:01 GMT (envelope-from git) Date: Tue, 26 Aug 2025 20:45:01 GMT Message-Id: <202508262045.57QKj1Yw075727@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 65f60d715fd9 - main - bsd.man.mk: Add a MANSRC.{TARGET} variable 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 65f60d715fd9ece2602062c832e6808c5c58866b Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=65f60d715fd9ece2602062c832e6808c5c58866b commit 65f60d715fd9ece2602062c832e6808c5c58866b Author: John Baldwin AuthorDate: 2025-08-26 20:44:11 +0000 Commit: John Baldwin CommitDate: 2025-08-26 20:44:11 +0000 bsd.man.mk: Add a MANSRC.{TARGET} variable This can be used to specify an alternate source file name for an individual manpage. For example, the following snippet: MAN= foo::bar.3 MANSRC.foo::bar.3= foo__bar.3 Will install a foo::bar.3 manpage but use foo__bar.3 as the source input to MANFILTER, etc. Suggested by: ivy Reviewed by: ivy Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D51793 --- share/mk/bsd.README | 3 +++ share/mk/bsd.man.mk | 20 +++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/share/mk/bsd.README b/share/mk/bsd.README index 89ee8527895e..85baba7ba117 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -259,6 +259,9 @@ MLINKS List of manual page links (using a .1 - .9 suffix). The linked-to file must come first, the linked file second, and there may be multiple pairs. The files are hard-linked. +MANSRC.${MAN:T} Name of source file for an individual manual page. + Defaults to the manual page name. + The include file includes a file named "../Makefile.inc" if it exists. diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk index 66155d1b4cd9..36d2cf1a1433 100644 --- a/share/mk/bsd.man.mk +++ b/share/mk/bsd.man.mk @@ -21,6 +21,9 @@ # MAN The manual pages to be installed. For sections see # variable ${SECTIONS} # +# MANSRC.${MAN:T} Name of source file for an individual manual page. +# Defaults to the manual page name. +# # MCOMPRESS_CMD Program to compress man pages. Output is to # stdout. [${COMPRESS_CMD}] # @@ -141,13 +144,13 @@ CLEANFILES+= ${${__group}:T:S/$/${CATEXT}${FILTEXTENSION}/g} # filenames contain colons. .for __target in ${__page:T:S/:/\:/g:S/$/${FILTEXTENSION}/g} all-man: ${__target} -${__target}: ${__page} +${__target}: ${MANSRC.${__page:T}:U${__page}} ${MANFILTER} < ${.ALLSRC} > ${.TARGET} .endfor .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) .for __target in ${__page:T:S/:/\:/g:S/$/${CATEXT}${FILTEXTENSION}/g} all-man: ${__target} -${__target}: ${__page} +${__target}: ${MANSRC.${__page:T}:U${__page}} ${MANFILTER} < ${.ALLSRC} | ${MANDOC_CMD} > ${.TARGET} .endfor .endif @@ -160,7 +163,7 @@ CLEANFILES+= ${${__group}:T:S/$/${CATEXT}/g} .for __page in ${${__group}} .for __target in ${__page:T:S/:/\:/g:S/$/${CATEXT}/g} all-man: ${__target} -${__target}: ${__page} +${__target}: ${MANSRC.${__page:T}:U${__page}} ${MANDOC_CMD} ${.ALLSRC} > ${.TARGET} .endfor .endfor @@ -180,7 +183,7 @@ CLEANFILES+= ${${__group}:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} .for __page in ${${__group}} .for __target in ${__page:T:S/:/\:/g:S/$/${MCOMPRESS_EXT}/} all-man: ${__target} -${__target}: ${__page} +${__target}: ${MANSRC.${__page:T}:U${__page}} .if defined(MANFILTER) ${MANFILTER} < ${.ALLSRC} | ${MCOMPRESS_CMD} > ${.TARGET} .else @@ -190,7 +193,7 @@ ${__target}: ${__page} .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) .for __target in ${__page:T:S/:/\:/g:S/$/${CATEXT}${MCOMPRESS_EXT}/} all-man: ${__target} -${__target}: ${__page} +${__target}: ${MANSRC.${__page:T}:U${__page}} .if defined(MANFILTER) ${MANFILTER} < ${.ALLSRC} | ${MANDOC_CMD} | ${MCOMPRESS_CMD} > ${.TARGET} .else @@ -238,7 +241,10 @@ stage_links.mlinks.${__group}: ${_mansets.${__group}:@s@stage_files.${__group}.$ realmaninstall-${__group}: .if defined(${__group}) && !empty(${__group}) -realmaninstall-${__group}: ${${__group}} +.for __page in ${${__group}} +__mansrc.${__group}+= ${MANSRC.${__page:T}:U${__page}} +.endfor +realmaninstall-${__group}: ${__mansrc.${__group}} .if ${MK_MANCOMPRESS} == "no" .if defined(MANFILTER) .for __page in ${${__group}} @@ -292,7 +298,7 @@ manlint: .PHONY checkmanlinks .if defined(${__group}) && !empty(${__group}) .for __page in ${${__group}} manlint: ${__page:S/:/\:/g}lint -${__page:S/:/\:/g}lint: .PHONY ${__page} +${__page:S/:/\:/g}lint: .PHONY ${MANSRC.${__page:T}:U${__page}} .if defined(MANFILTER) ${MANFILTER} < ${.ALLSRC} | ${MANDOC_CMD} -Tlint .else