From nobody Tue Jan 20 16:52:56 2026 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 4dwYKh3Yh6z6NpZk for ; Tue, 20 Jan 2026 16:52: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwYKh0yR0z3VW9 for ; Tue, 20 Jan 2026 16:52:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768927976; 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=oc0yM8hqapGGbbsy6ZoIQs4T7C9rXFUOrkfC7xLe2nU=; b=mn6oIZc6JBNt9fhvDdv1T2q5lbQTg4An0F4+AN85dCQFIt72mwsXooIjEI+ouiiLzfGOVo UIZTVeZS2n3QQSXNlplSSDwar+ybnUbNl6FwoJ+jDv+CuJjmoCpRiUaThSP0VQ3Y49Wtux D12uSLzxVNmNByHleuUXNQBEKfPu92eduhwCHVJ/csgd4mXG01yeRkWp7QqqktaZDatjkm uI6NwSBuiHD34g3nKLuPSXe9ue8tdGEfJbjsxcJoce1nchS1mL/ky7cVee21lQPRrVHWbG Gpank25EEKQqF0q7NCCPMmfh16DsK338aedjYBqa3HvhW5ujAG74WtfM7GF9qQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768927976; 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=oc0yM8hqapGGbbsy6ZoIQs4T7C9rXFUOrkfC7xLe2nU=; b=jgmXcR2JHW0MGib3/gCsazHdbifxQcY4FXodjLnWmhrv4FNdPlRUu0zVunqYvC4PWJqnlC +aY2IDqq3S05rHxgGBJsJCyB06+Xgn7P7kkZx++gA3D2nfJHYoAmNG7tw42uvzvu9uJG0/ 2fdI+Fo23o6nCxwPb8atMEPVx3WHu+1lALy489o0+f6q/3PgsltkRjEf6ZXid0F6Ybi2Gs UEYczQCUuyyKp5nQvVw/23Jq2ECwiBlYcubtmznF57swvAVBSjcBBPgbvpN/wIx0YQHmBj cxOlmDb9KDXRqtB93LdimbupifTaB6eK5d/IwlbpO2/lZfs2O1h7LhGqySFwpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768927976; a=rsa-sha256; cv=none; b=sWvJTtHAuvRvgPH5fwgKy2v/Lg6QvICIhRsoQVkWneTDdyUEBu6II3CV5tc7fL+TmOuh8+ jfByt8wPNqZQCrRLxs1mL4eTH9XAizHrJMIHNkQw23FD6pLogzkpeBaK9HhNMLHgVA+4Ld 2sjLf4y4QExKFX+IgNVWzepO3KExfOykYwvy7aEENci2uF4yCeF/Il93tShfj5MWU9oV8n Q1VS15gh2KwLZ57selfGgQZjd/kZCF56OEgjNab9fVnEO0d2gJ42nQAMpt8QQkuTX9rqbK n4pJzCz0O+a80ofTZzPerNc542hq1ulY9TBml9K0g5Mz3OLa5tOjiELTuiF8LQ== 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 4dwYKh0F7Cz1PgG for ; Tue, 20 Jan 2026 16:52:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34695 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 16:52:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 9b91d4905583 - stable/15 - makeman.lua: Update for src.conf in the src tree 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9b91d490558342d4a4a0893b15306c7099430c66 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 16:52:56 +0000 Message-Id: <696fb2e8.34695.7e74b544@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9b91d490558342d4a4a0893b15306c7099430c66 commit 9b91d490558342d4a4a0893b15306c7099430c66 Author: Ed Maste AuthorDate: 2025-12-16 16:04:31 +0000 Commit: Ed Maste CommitDate: 2026-01-20 16:50:09 +0000 makeman.lua: Update for src.conf in the src tree Copy the text change from the shell makeman to makeman.lua. Fixes: dd8c666d8b78 ("src.sys.mk: Support src.conf in SRCTOP") Sponsored by: The FreeBSD Foundation (cherry picked from commit 2619d439fa860db734dbbf4b153c5ac9b15c7e49) --- tools/build/options/makeman.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/build/options/makeman.lua b/tools/build/options/makeman.lua index e96e6f50174b..7ce919f7a8de 100644 --- a/tools/build/options/makeman.lua +++ b/tools/build/options/makeman.lua @@ -44,8 +44,11 @@ variables that control the aspects of how the system builds. .Pp The default location of .Nm -is -.Pa /etc/src.conf , +is the top level of the source tree, or +.Pa /etc/src.conf +if no +.Nm +is found in the source tree itself, though an alternative location can be specified in the .Xr make 1 variable