From nobody Tue Oct 27 22:07:07 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 4jDl350cFdz6xQYw for ; Tue, 27 Oct 2026 22:07:13 +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 4jDl345JqVz4RmY for ; Tue, 27 Oct 2026 22:07:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793138832; 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=hzQtdECnnhtG+IvawymAbTrd6AV7OG9BAbyXJQ/jpYs=; b=wzOAIiLWZKO8PrW8BINeE5T8yUu4JaEThVM9JtUNYTxshleozjgyub7z7wRMfOA47d2Ym7 Ad60edw5GE+dIk1O54F9w63kiqJ2MXMBzMOUBw3E5MmGqmrxFuZFzk/X1R2uJIruJSpzlc I5OXaRVfgoqm6Q8f0h3eRMHP0P1H1+oVPvOrJZ9T2ouAgZArnwuHCHoGgbd2d5XJgIup+H OfeG5mGjamxcLC/UufZuESUI6z+0fdO2o4+oTdEXRiXzMhjNFMuM4gxX48LxvC3THXUHzp KhilrjBtg8G7RPgp2eVepfbg7PgV5sJrR2q8j0MeB9GTUoD7Y0JJrNlTCiCIeg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793138832; b=kqdh2PqiK39mSUw+R7EPrLQlssjvD19Bd4IF5h16kclgtuN8YIqTfP3lCdxHBejrJD/nrG lj6YNRxYyKeDaoy/ujgaTvHS/PzmNSWNqVciXv9JXAtSpMBMbI0wRdYf5vD33R3+fJC6P5 WnjWtXQzUr1hTtnkArAB1ZLqytIL54ou84q9wNEAnIk6tA1UzxRP4D0hzbajk1X+ApEpYF ET6p+lD4LhS/sSMHOCo6E9WOoNlPogvMkTYIzWW5cxrjhRQ3HFig3kop2fwsEBlj9Easj6 67AX1mqOaQ10YUF7jL/8jBxs6PVFn9UUS8M8TMhiQNLKIUu8QGt455+VR3qQzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793138832; 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=hzQtdECnnhtG+IvawymAbTrd6AV7OG9BAbyXJQ/jpYs=; b=ZCHd2Q970Xme27BYXpOkD91ZBQwFdAa+ye2N58XZD7rwt9OqCMGjCF35ZwOVV0cE5h+rLi dwsD6/4cyHhN+JCE86MKkxI0OYCmnI/3VXckh803rb9MSQOt3fXHplWlVzRegtMUsWl2kv nWaUl9zBxEsiwa/SbqcsnfXZGWcIeLdtnfcX8JAPPERuV2WzILCbQSfKAWmSB4m4KNOCvd 4dRAcRHh9hnNprqwv0BRRSDCRXU1zNTB9H0qODfYyPWqX+FFKcTh0TAm+WhCtnY6tIRVOS Do7ntm6S2vPAh/jWR0xVljmMBc0Gl2YK3hqRvCnrYQTPyXFkrAVzPc9za3wdJw== 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 4jDl344zGSzgtx for ; Tue, 27 Oct 2026 22:07:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 228ea by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 27 Oct 2026 22:07:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dima Panov Subject: git: 33c8b4b3f869 - stable/14 - 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-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the 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/14 X-Git-Reftype: branch X-Git-Commit: 33c8b4b3f8699772c6bb9def696a2c9da670af99 Auto-Submitted: auto-generated Date: Tue, 27 Oct 2026 22:07:07 +0000 Message-Id: <6ae1208b.228ea.272b293e@gitrepo.freebsd.org> The branch stable/14 has been updated by fluffy: URL: https://cgit.FreeBSD.org/src/commit/?id=33c8b4b3f8699772c6bb9def696a2c9da670af99 commit 33c8b4b3f8699772c6bb9def696a2c9da670af99 Author: Dima Panov AuthorDate: 2026-10-26 20:07:56 +0000 Commit: Dima Panov CommitDate: 2026-10-27 22:06:59 +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 8c734a4c47a1..853fc918facb 100755 --- a/usr.bin/man/man.sh +++ b/usr.bin/man/man.sh @@ -733,7 +733,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