The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=7e9f0bf1c05c3e0de161c4ea9f0dfd71791f8957
commit 7e9f0bf1c05c3e0de161c4ea9f0dfd71791f8957 Author: Lexi Winter <i...@freebsd.org> AuthorDate: 2025-09-10 18:38:01 +0000 Commit: Lexi Winter <i...@freebsd.org> CommitDate: 2025-09-19 01:17:27 +0000 packages: Turn off MANSPLITPKG by default Manpages are very small, and having a separate manpages package for every base package is quite annoying for users. Turn this option off by default. Discussed with: bapt Reviewed by: manu, emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D52417 (cherry picked from commit a8a18eeb5e1711ad27c3ee20eb342b73d3badffa) --- UPDATING | 6 ++++++ share/man/man5/src.conf.5 | 4 ++-- share/mk/bsd.opts.mk | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/UPDATING b/UPDATING index ae4f14a24858..fa8ef72082c1 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,12 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20250918: + The MANSPLITPKG knob has been turned off by default, so pkgbase builds + will no longer generate "-man" subpackages; instead the manpages will + be shipped in the packages they belong to. If you want to continue + building split man packages, set WITH_MANSPLITPKG=1. + 20250916: If SRCCONF is unset and a file named src.conf is present at the top of the source tree, it will now be used instead of diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 648249148817..7ba8b4ac5e8f 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1215,8 +1215,8 @@ is set explicitly) .It Va WITHOUT_MANCOMPRESS Do not install compressed man pages. Only the uncompressed versions will be installed. -.It Va WITHOUT_MANSPLITPKG -Do not split man pages into their own packages during make package. +.It Va WITH_MANSPLITPKG +Split man pages into their own packages during make package. .It Va WITHOUT_MAN_UTILS Do not build utilities for manual pages, .Xr apropos 1 , diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk index 2251b499ffdc..73ebf82c258f 100644 --- a/share/mk/bsd.opts.mk +++ b/share/mk/bsd.opts.mk @@ -60,7 +60,6 @@ __DEFAULT_YES_OPTIONS = \ MAKE_CHECK_USE_SANDBOX \ MAN \ MANCOMPRESS \ - MANSPLITPKG \ NIS \ NLS \ OPENSSH \ @@ -79,6 +78,7 @@ __DEFAULT_NO_OPTIONS = \ CCACHE_BUILD \ CTF \ INSTALL_AS_USER \ + MANSPLITPKG \ RETPOLINE \ RUN_TESTS \ STALE_STAGED \