From nobody Sun Jan 11 02:59:26 2026 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 4dpgG70zSwz6NLV5 for ; Sun, 11 Jan 2026 02:59:27 +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 4dpgG668Kjz46TL for ; Sun, 11 Jan 2026 02:59:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768100366; 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=fR4Esg2ZmQWrmPvlwSdJCu1qh1l/DeLZf8U2Id5x/SU=; b=vpVF8BwGq7Uut+YhbW54H65p7jE54sX2/urEi6pqCDFir91yYiQ2/IHFiINsWQFSat+rEo 7H0F/6Fz0Wmsus//6JsOO7QHjHudHatmqvxTSainsRHqsN3lCFkyyLEbfCzr5cJ48CoTR+ YU25IUsRw7TBHT+pVKtVODNUk+dvQ0VOMTpvxbAYm4o+pKotmwDk0B7SBfCXITz6RWEF6+ 3ruA/lltN2GKkXbg+v8kxFkZw/c7Uu2ug2r1M7/uScto9b+6fjzCj1yqi0B09etQId+cm7 484up7n8ESniZVzqkjw1kmLCinGFqb1YmCuFZBjEq/BBqPB8/SmxgJmACkhKYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768100366; 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=fR4Esg2ZmQWrmPvlwSdJCu1qh1l/DeLZf8U2Id5x/SU=; b=Yn+d4hseVbAfDHBGY8TDhhLC8XU0NGgVrQDBIWtfwJt/so8T0a6v1IrfclYiSpZqC6/i2I v9AKFBq5OfgT0PgfS9gxP0kn+pUqvck1tuJysDCNzbo1NJXnh6ScRm8PqlAdZ6X65Zdn/7 kLa3ER7TK2kTmxzwUhmguRYW+4RA1K3NfIHg9JIM7rBroixen5/UJNYhw3lGaJyO4RnCkd KHKBpWXCVE1KPpP11PwiWlMmnqWpJYWmS+oKd9UE2gaegwh6VVjgToMBrUzwtfTHFpLweF /5R/pw+pUqtQGZdEcOPurcC4GM+6rbJ3UjJ6iWaoTK8LbxHazAvGPnuaa0bJXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768100366; a=rsa-sha256; cv=none; b=wIsDC0anhrRHJny0bDpJ1+a8yBWzDTVzeKWE2UeVaxmXFvCKVhTTZ2LDxkCSQGHGer/qCB TN5BUcolUlGMiSswGO71j+wHhiqD6wjoGmx1NBn68Yd5wLnwhGtmOX9S4O8mwX45RZolzt 4Y1JijbSD7XSk+tnt7UqNlLzkrTtV82x6HYvvMHQna7JOfot7COyXVBfLoVnrf4rnmLajw dHcGEDiFrfTgwYJ/w92k/qxGP+s9n+jwaYEqWhe7cYdEWE6A0089LPfQ0cxfYx8cQ/YLSm KBA3SAWy9/WxvlTq8JNQMH/lRjVQLWQ7PrNVjckGxc8/m8hlrCrqo8GuJQrUbA== 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 4dpgG65Ff1z751 for ; Sun, 11 Jan 2026 02:59:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d883 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 11 Jan 2026 02:59:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Simon J. Gerraty Subject: git: 9fed072b4422 - main - bsd.man.mk simplify staging 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: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9fed072b44223f061a0dbf604741091b3bc09aee Auto-Submitted: auto-generated Date: Sun, 11 Jan 2026 02:59:26 +0000 Message-Id: <6963120e.d883.21154dc@gitrepo.freebsd.org> The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=9fed072b44223f061a0dbf604741091b3bc09aee commit 9fed072b44223f061a0dbf604741091b3bc09aee Author: Simon J. Gerraty AuthorDate: 2026-01-11 02:59:20 +0000 Commit: Simon J. Gerraty CommitDate: 2026-01-11 02:59:20 +0000 bsd.man.mk simplify staging We actually only need the high level targets stage_files and stage_links meta.stage.mk will take care of the details. --- share/mk/bsd.man.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk index 412576eb2fe9..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 _mansets.${__group}:= ${${__group}:E:O:u:M*[1-9]:@s@man$s@} .for _page in ${${__group}} STAGE_SETS+= ${__group}.man${_page:T:E} -STAGE_TARGETS+= stage_files.${__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