From nobody Tue Oct 27 22:05:15 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 4jDl0q5H0rz6xQ8X for ; Tue, 27 Oct 2026 22:05:15 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jDl0q43nCz4R5b for ; Tue, 27 Oct 2026 22:05:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793138715; 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=yQBDxHEF1lEmXni1/e93InpWdCB0gk3uaR6M9IURCes=; b=qedaaBrui8UyQkZa6LemUev4bXyGcfZKKEHHk3KhiXuF2PhasTWl+/yaVieH2X3p3k2TCW KteYmkzlKuiyEvcgNtPCLySaQpOxiWvilN9bZj9WFfrHjgLC3BrMvO9igzS3itwQsWVltM E8szOvVwCv4iYa8Gz4sRrhhYEpd/79EUzHkCQVdLUXKy6nEW7fSkNOFjyiNK0KT5RmZ8HG JwWCVz1G6t6ic0Yyhib5kCSOtiquFWc/QAENlmJ26+3UQr7v2yodN0GrWuteHUZfijr0ap WyS8E4DOO/oYVKMrotrWUoufw9IWuPKrb8wTXwBAMia8tKXPNiaGJX8aXe++Rw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793138715; b=cEVRhOLJ/2BareLMg4+uuTyjG/vWmvncMcnSWXjsLmGAl47b/C+7q+2CXLKa/rcKwU7a33 uUc6uec1suMIsed25UIDzKzbdHxLFl7udBoWy86oNhErkkfFSNunn4GUAB1tVZO5FO1BQL oz7witvcUSIqyxf3rXx4w4dNcJcRQ8MU46OH2tag8z4XJZslz6X7GX6krwRW738j/F49t6 tvjIbvQqoPveMQLSGXiRwPBvbElNQBk9muw/0EfZW6AG98BHTWatDcpVEVOqi6ypumBKr5 NiZTIOJQ39SL0TJiPLo+6AhIno+C63yZDZHgK7QuBq0GD3FX3g5tr16nW9nsmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793138715; 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=yQBDxHEF1lEmXni1/e93InpWdCB0gk3uaR6M9IURCes=; b=PMZq0kzwFmgO9sJo7oR9CIWnSGeyMvEbfEKloK4bnqdr0Kf3Rrtg1Hb+NErUvJznUROb+y 5Ymt6SymN++WsI7YzvakodIn6WrUf3PxtSj/lObYBrPnkr172Lpi+0+w4GPC8xKjTdxueX JYEeBLuRBy1Qe0Dy7ShoXjWch7QZwrl4bD5GK/f1qP9GU5Q5nGlJR6tG85JzAK+crJLf4o VFXedzPx2wbXs2WIkEISqe+987IqQJs1GdEI+lydfPxC9DkJOwcMk2kE4JTdgD9MwYK8YO bsFXpUGUWK21lNGlHOYkYU/8rIopxHRzpOe5mfhk5ewKopLCaLkPY5ZZw+8QQw== 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 4jDl0q3FRrzh2w for ; Tue, 27 Oct 2026 22:05:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23b9c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 27 Oct 2026 22:05:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dima Panov Subject: git: 9fe7f514ef24 - stable/15 - usr.bin/man: allow man(1) to search translated manpages in pure $man_lang subdirectory (+) List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9fe7f514ef249372afe78773c230a8f9e13cb672 Auto-Submitted: auto-generated Date: Tue, 27 Oct 2026 22:05:15 +0000 Message-Id: <6ae1201b.23b9c.301c588@gitrepo.freebsd.org> The branch stable/15 has been updated by fluffy: URL: https://cgit.FreeBSD.org/src/commit/?id=9fe7f514ef249372afe78773c230a8f9e13cb672 commit 9fe7f514ef249372afe78773c230a8f9e13cb672 Author: Dima Panov AuthorDate: 2026-10-26 20:07:56 +0000 Commit: Dima Panov CommitDate: 2026-10-27 22:04:44 +0000 usr.bin/man: allow man(1) to search translated manpages in pure $man_lang subdirectory (+) Currently our man(1) utility search manages only in $lang_country.$charset, $lang.$charset and, as failover, in en.$charset which is historical behavior. But nowadays most of ported software uses only $lang subdirectories for translated manpages instead of use full locale notation, for example, share/ja/man1, share/de/man1, share/ru/man1. In such cases, our man(1) utility cannot find any translated manpages and silently fallback to english version. Add $man_lang in search path allows man(1) search and use translated manpages under historical and modern path traditions MFC after: 1 day MFC to: stable/15 stable/14 Reviewed by: ziaee, fernape Approved by: fernape Differential Revision: https://reviews.freebsd.org/D55805 (cherry picked from commit 5250c98908482babae8379b4dede10c64e8639ae) --- usr.bin/man/man.1 | 4 ++++ usr.bin/man/man.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/usr.bin/man/man.1 b/usr.bin/man/man.1 index 707677ccce06..43c1d4c15056 100644 --- a/usr.bin/man/man.1 +++ b/usr.bin/man/man.1 @@ -225,6 +225,8 @@ will search for locale specific manual pages using the following logic: .It .Va lang . Ns Va charset .It +.Va lang +.It .Li en . Ns Va charset .El .Pp @@ -242,6 +244,8 @@ will search the following paths when considering section 1 manual pages in .It .Pa /usr/share/man/ja.eucJP/man1 .It +.Pa /usr/share/man/ja/man1 +.It .Pa /usr/share/man/en.eucJP/man1 .It .Pa /usr/share/man/man1 diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh index 920223ce3c27..f10209544ba7 100755 --- a/usr.bin/man/man.sh +++ b/usr.bin/man/man.sh @@ -748,7 +748,7 @@ man_setup_locale() { man_country="${lang_cc#*_}" man_charset="${locstr#*.}" locpaths="$locstr" - locpaths="$locpaths:$man_lang.$man_charset" + locpaths="$locpaths:$man_lang.$man_charset:$man_lang" if [ "$man_lang" != "en" ]; then locpaths="$locpaths:en.$man_charset" fi