From nobody Mon Aug 04 19:46:34 2025 X-Original-To: dev-commits-src-main@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 4bwnB31l1zz63RX6; Mon, 04 Aug 2025 19:46:35 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bwnB309f3z4KG3; Mon, 04 Aug 2025 19:46:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754336795; 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=Lnf/8cNTSVaFC70k2XXudxIi8Aay/qrHo6zZ1hBbcBU=; b=jI8nrWAc7GWVumQ7rcHfqCgM61bqef0ES2dG15s/GWdDA+zC4x0a9D8eyGvsUmIwLiBgi6 2JUJPiW3lVsSOiQgXryzk12+3HwNs7DCf19+RQWBsTaYU7WyFnD870h3r3Bp6yumCseADL 6rDGEv7KDgD9QsYC2hH2k1q2TrqEMP6+QgzrbmGjG8JgPkfHneCLkYW8ZiunKp3nqE5Zzn Hu/xhVX6A1T+15upniqoC9f9TCpp5i5QB4ludF/IC9yloC1XA8mYkHG8+phZ2d33fehwQc CTGywlxfuyAIB7FUvJMKKLS7/3mPFjPVTjbZMJc32CC1PwG+UGcl7VouzdAS/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754336795; 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=Lnf/8cNTSVaFC70k2XXudxIi8Aay/qrHo6zZ1hBbcBU=; b=XyX8DA5pwJVHDb+Bkk5+1P//SL8dR+HqWy1dP6urjhG9C5/hu3BdSNyvbveIF0yW7td940 lwgoo+AE1NzsxAlbuZ0yPbiMM8l+i1D0QeOagXTZEHHks7r5fuKSoAynybi/NoT2XNjhYl bjbg3E/P0fVa1yKGPwO2D1frUit6DPh1mgoWovDGI/Pd7Q8UmGCZgbGTpCHLdlQVZlXaIw uqRXdNiyJFHMCKwZFDMo/4lSU+xhUa/Vpydk6gb/hOOQnvm02hH1agdwjy5v2SDD+CxXw1 hKEpkxXfSpSpclzHLf7YqH4F8H7IyosLbM7fu9pt5ognT+NoYihdCY3pR84ZGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754336795; a=rsa-sha256; cv=none; b=vuxRpY6LDg70Ofvqou6BwwyJ+nnAkk2QruNS8i3fzzGT5+S2kmDV2+JeXrmd/gT3N7JBkC hydR2Tee/fHgMAqLXfnGb3g1mDZpwBlc0DPN5rFutSB1QrZG7AYpPRjY96XN6xZbS9UDBR 9XhWbXJv7cDixMXDEemERn63T76rdWrE7FRdFG2qSuCjXMLhZpASNbu7VikxqeKQsPLjqw 2FilxiM12jB+wox3RaySx3kIFdkrJJHf67F989PKeN1HzPnMKOtLT8VpIDl3ZaM2nu/AWI 2fXIJmyT+hn3iHXNcLa58ohcHdCSBELxuBZnQ2IAIyIrU+RoNIXeSY1SBaE92Q== 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 4bwnB26W3jz13B5; Mon, 04 Aug 2025 19:46:34 +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 574JkYxQ098632; Mon, 4 Aug 2025 19:46:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 574JkYo3098629; Mon, 4 Aug 2025 19:46:34 GMT (envelope-from git) Date: Mon, 4 Aug 2025 19:46:34 GMT Message-Id: <202508041946.574JkYo3098629@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: ec1656181790 - main - bsd.man.mk: Support manual pages with colons in the filename List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: ec16561817902d480f8ebde3d060844b1997d8de Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ec16561817902d480f8ebde3d060844b1997d8de commit ec16561817902d480f8ebde3d060844b1997d8de Author: John Baldwin AuthorDate: 2025-08-04 19:38:06 +0000 Commit: John Baldwin CommitDate: 2025-08-04 19:38:06 +0000 bsd.man.mk: Support manual pages with colons in the filename This requires extra escaping since make interprets the colons as terminating a rule. Discussed with: sjg Sponsored by: Chelsio Communications Pull Request: https://github.com/freebsd/freebsd-src/pull/1794 --- share/mk/bsd.man.mk | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk index a5a4fd528268..3444e9612a20 100644 --- a/share/mk/bsd.man.mk +++ b/share/mk/bsd.man.mk @@ -137,13 +137,15 @@ ZEXT= CLEANFILES+= ${${__group}:T:S/$/${FILTEXTENSION}/g} CLEANFILES+= ${${__group}:T:S/$/${CATEXT}${FILTEXTENSION}/g} .for __page in ${${__group}} -.for __target in ${__page:T:S/$/${FILTEXTENSION}/g} +# Escape colons in target names to support manual pages whose +# filenames contain colons. +.for __target in ${__page:T:S/:/\:/g:S/$/${FILTEXTENSION}/g} all-man: ${__target} ${__target}: ${__page} ${MANFILTER} < ${.ALLSRC} > ${.TARGET} .endfor .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) -.for __target in ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} +.for __target in ${__page:T:S/:/\:/g:S/$/${CATEXT}${FILTEXTENSION}/g} all-man: ${__target} ${__target}: ${__page} ${MANFILTER} < ${.ALLSRC} | ${MANDOC_CMD} > ${.TARGET} @@ -156,7 +158,7 @@ ${__target}: ${__page} CLEANFILES+= ${${__group}:T:S/$/${CATEXT}/g} .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) .for __page in ${${__group}} -.for __target in ${__page:T:S/$/${CATEXT}/g} +.for __target in ${__page:T:S/:/\:/g:S/$/${CATEXT}/g} all-man: ${__target} ${__target}: ${__page} ${MANDOC_CMD} ${.ALLSRC} > ${.TARGET} @@ -176,7 +178,7 @@ ZEXT= ${MCOMPRESS_EXT} CLEANFILES+= ${${__group}:T:S/$/${MCOMPRESS_EXT}/g} CLEANFILES+= ${${__group}:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} .for __page in ${${__group}} -.for __target in ${__page:T:S/$/${MCOMPRESS_EXT}/} +.for __target in ${__page:T:S/:/\:/g:S/$/${MCOMPRESS_EXT}/} all-man: ${__target} ${__target}: ${__page} .if defined(MANFILTER) @@ -186,7 +188,7 @@ ${__target}: ${__page} .endif .endfor .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) -.for __target in ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/} +.for __target in ${__page:T:S/:/\:/g:S/$/${CATEXT}${MCOMPRESS_EXT}/} all-man: ${__target} ${__target}: ${__page} .if defined(MANFILTER)