Date: Sun, 26 Oct 2025 02:28:08 GMT From: Lexi Winter <ivy@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 450fb637f453 - main - mandoc: Also run makewhatis for /usr/share/openssl/man Message-ID: <202510260228.59Q2S8bP069144@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=450fb637f453c3722aa9f0aeb369e2aa2f5a5001 commit 450fb637f453c3722aa9f0aeb369e2aa2f5a5001 Author: Lexi Winter <ivy@FreeBSD.org> AuthorDate: 2025-10-25 17:30:03 +0000 Commit: Lexi Winter <ivy@FreeBSD.org> CommitDate: 2025-10-26 02:26:06 +0000 mandoc: Also run makewhatis for /usr/share/openssl/man We use a pkg(8) trigger to run makewhatis for /usr/share/man when manpages are updated, but this doesn't cover /usr/share/openssl/man. Rewrite the trigger to process a list of directories instead of a single directory, and include /usr/share/openssl/man in the list. MFC after: 3 days Reviewed by: emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53064 --- usr.bin/mandoc/mandoc.ucl | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/usr.bin/mandoc/mandoc.ucl b/usr.bin/mandoc/mandoc.ucl index f320b6f547fd..75b8123d55cc 100644 --- a/usr.bin/mandoc/mandoc.ucl +++ b/usr.bin/mandoc/mandoc.ucl @@ -1,10 +1,14 @@ -path_glob: "/usr/share/man/*" +path_glob: [ + "/usr/share/man/*", + "/usr/share/openssl/man/*", +] cleanup: { type: lua sandbox: false script: <<EOD os.remove("/usr/share/man/mandoc.db") + os.remove("/usr/share/openssl/man/mandoc.db") EOD } @@ -12,7 +16,17 @@ trigger: { type: lua sandbox: false script: <<EOD - print("Generating apropos(1) database...") - pkg.exec({"/usr/bin/makewhatis", "/usr/share/man"}) + + local dirs = { + "/usr/share/man", + "/usr/share/openssl/man", + } + + for _,dir in ipairs(dirs) do + if pkg.stat(dir) then + print("Generating apropos(1) database for "..dir.."...") + pkg.exec({"/usr/bin/makewhatis", dir}) + end + end EOD }home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202510260228.59Q2S8bP069144>