From nobody Thu Jan 15 18:34:19 2026 X-Original-To: dev-commits-src-branches@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 4dsWq03Nq3z6PHnk for ; Thu, 15 Jan 2026 18:34:20 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dsWq00dJBz3qCj for ; Thu, 15 Jan 2026 18:34:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768502060; 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=CTI+0x971U0P1soAiwPrruOeMpBfpYQOR530qDLH5/E=; b=JukGJir2Qo61mi1XE6Y2n7PQ1jCMscfoqNMdGz7iUXUdgSNlAci62kjlKMcqhUynzf6TME ViYRR/hoJB+EwRI+IbBCW0QlO1x69ekmvDfqUX3cPRGTqlgVfZoPAnVfWtZdRUrEGFgeW4 qsU7rWvbgdPveQvQAvyemlLJz133U8G8kI//ESwYN2+EqaIcsIecjywxjrPukHF42bxt9E 72QOrUhLrftt8cf/4kzZFmZ5Res8Z11eRzoaJK6XxnUgXNwfHOdRRXmJVmiK6MyTYuMc84 93T1Om8Thngpxs2EH2ixPWFGvDs4PbidDts1MJWWELMintyrVfMxkVKGLrnLTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768502060; 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=CTI+0x971U0P1soAiwPrruOeMpBfpYQOR530qDLH5/E=; b=vA3FLIY5c6P1C1SGsdBcZw854KhhBh3j3cMlzbQT+12+X7/TpDt1lGRsupRLyhsYIjuW3g 2qHQxZQC6WQKfxOd8Amfcx/+OsSxZ8XRqcJCFQHlsGj0FL0q4HZJpUg5mPU8POONFwKfTv 9NBa7Uow1lBOcO8HbUUzjpgnLLTpeIws24MwTyp43Ra0MnEA4gGJZrZzXy1lWtu/METxz6 s29THpqCclFi/OjHdlPE31jE6Jh079OokMa9ttP5jLAk+HjDSq4YHIRMYausLRovc3ysBo +QjIDvS5aoObIBvIYNB5Ap30soYI2aH5q5oZAJ0rGnnjm1nbx/DA1cyJsJHntg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768502060; a=rsa-sha256; cv=none; b=WKc/qnBYkY6U9uNdAw7fg25dppfMxaxLnsok9xbk/KoHUHiCm0DzNOdvDYaORFYVOdXxdB SguKJ8C93zEG02Rc7d3qlhFzH/OLk3DpJuRWPWTgO9VZt33CEEzVNWDAksRk2DYsluYDRP S0daFkbEPWCC/YncGlS6I7DuuAt+GcMsMuZKGU1imSrwaOgbS0QsuOusuCJbTNyjytGM8I wrRge34X4TKP9OWZSi+yh3x5niLKHpAAn8Rkwc1QSJ8ftntZjEySsmAiFv1XQLCsBeofln qmhGZ3IVKe7HmbkBPlbf4nXJBwPSKQhI/w03kzL9PwsSWa4fyAGPG2XtLRc3Qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dsWpz6mk2zgQx for ; Thu, 15 Jan 2026 18:34:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40274 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 15 Jan 2026 18:34:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Simon J. Gerraty Subject: git: 32dd4b31dd9d - stable/15 - bsd.man.mk fix and simplify staging List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 32dd4b31dd9d3dfbe92a330ffe2bf49c8bdf7bf1 Auto-Submitted: auto-generated Date: Thu, 15 Jan 2026 18:34:19 +0000 Message-Id: <6969332b.40274.4bea7122@gitrepo.freebsd.org> The branch stable/15 has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=32dd4b31dd9d3dfbe92a330ffe2bf49c8bdf7bf1 commit 32dd4b31dd9d3dfbe92a330ffe2bf49c8bdf7bf1 Author: Simon J. Gerraty AuthorDate: 2026-01-11 02:44:40 +0000 Commit: Simon J. Gerraty CommitDate: 2026-01-15 18:31:45 +0000 bsd.man.mk fix and simplify staging The STAGE_SETS need to match STAGE_DIR. For each STAGE_SET we have STAGE_DIR.${STAGE_SET} and create a target stage_files.${STAGE_SET}, the settings all need to be self consistent to work. We actually only need the high level targets stage_files and stage_links meta.stage.mk will take care of the details. (cherry picked from commit 9cd89fc5aa3c0e76375732788fe9d4282d65224f) (cherry picked from commit 9fed072b44223f061a0dbf604741091b3bc09aee) --- share/mk/bsd.man.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk index dde11afb8283..7490fd13aefc 100644 --- a/share/mk/bsd.man.mk +++ b/share/mk/bsd.man.mk @@ -252,10 +252,10 @@ _MANLINKS+= ${CATDIR}${_osect}${MANSUBDIR}/${_oname} \ .if defined(${__group}) && !empty(${__group}) .if ${MK_STAGING_MAN} == "yes" -STAGE_TARGETS+= stage_files.${__group} +STAGE_TARGETS+= stage_files _mansets.${__group}:= ${${__group}:E:O:u:M*[1-9]:@s@man$s@} -STAGE_SETS+= ${_mansets.${__group}} .for _page in ${${__group}} +STAGE_SETS+= ${__group}.man${_page:T:E} stage_files.${__group}.man${_page:T:E}: ${_page} .if target(${_page}${MCOMPRESS_EXT}) stage_files.${__group}.man${_page:T:E}: ${_page}${MCOMPRESS_EXT} @@ -263,8 +263,8 @@ stage_files.${__group}.man${_page:T:E}: ${_page}${MCOMPRESS_EXT} STAGE_DIR.${__group}.man${_page:T:E}?= ${STAGE_OBJTOP}${MANDIR}${_page:T:E}${MANSUBDIR} .endfor .if !defined(NO_MLINKS) && !empty(${__group}LINKS) +STAGE_TARGETS+= stage_links STAGE_SETS+= mlinks.${__group} -STAGE_TARGETS+= stage_links.${__group} STAGE_LINKS.mlinks.${__group}:= ${${__group}LINKS:M*.[1-9]:@f@${f:S,^,${MANDIR}${f:E}${MANSUBDIR}/,}@} stage_links.mlinks.${__group}: ${_mansets.${__group}:@s@stage_files.${__group}.$s@} .endif