From 254f85f060d6542bfcb5fafad9a0e0b7d76abc4b Mon Sep 17 00:00:00 2001
From: Doug Rabson <dfr@FreeBSD.org>
Date: Thu, 14 Sep 2023 15:38:07 +0100
Subject: [PATCH] pkgbase: Split out manpages by default

This helps with building small container images using pkgbase.

Reviewed by:	manu bapt
MFC after:	1 week
Differential Revision: https://reviews.freebsd.org/D41861

(cherry picked from commit 74da9c39c3460213750477204979989b5c39cbcd)
---
 UPDATING                  | 5 +++++
 share/man/man5/src.conf.5 | 4 ++--
 share/mk/bsd.opts.mk      | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/UPDATING b/UPDATING
index 4a8ce04b94e..9858822f407 100644
--- a/UPDATING
+++ b/UPDATING
@@ -12,6 +12,11 @@ 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.
 
+20230924:
+	Enable splitting out pkgbase manpages into separate packages by
+	default. To disable this, set WITHOUT_MANSPLITPKG=yes in src.conf.
+
+
 20230924:
 	Move standard include files to the clibs-dev package and move clang
 	internal libraries and headers to clang and clang-dev. Upgrading systems
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index 82c8752722a..b31d44abde9 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1157,8 +1157,8 @@ is set explicitly)
 .It Va WITHOUT_MANCOMPRESS
 Do not install compressed man pages.
 Only the uncompressed versions will be installed.
-.It Va WITH_MANSPLITPKG
-Split man pages into their own packages during make package.
+.It Va WITHOUT_MANSPLITPKG
+Do not 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 bb9fba38e5a..b4761333d8c 100644
--- a/share/mk/bsd.opts.mk
+++ b/share/mk/bsd.opts.mk
@@ -60,6 +60,7 @@ __DEFAULT_YES_OPTIONS = \
     MAKE_CHECK_USE_SANDBOX \
     MAN \
     MANCOMPRESS \
+    MANSPLITPKG \
     NIS \
     NLS \
     OPENSSH \
@@ -78,7 +79,6 @@ __DEFAULT_NO_OPTIONS = \
     INIT_ALL_PATTERN \
     INIT_ALL_ZERO \
     INSTALL_AS_USER \
-    MANSPLITPKG \
     PROFILE \
     RETPOLINE \
     STALE_STAGED \