Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 14 Sep 2023 15:51:15 GMT
From:      Doug Rabson <dfr@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 74da9c39c346 - main - pkgbase: Split out manpages by default
Message-ID:  <202309141551.38EFpFJF074783@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by dfr:

URL: https://cgit.FreeBSD.org/src/commit/?id=74da9c39c3460213750477204979989b5c39cbcd

commit 74da9c39c3460213750477204979989b5c39cbcd
Author:     Doug Rabson <dfr@FreeBSD.org>
AuthorDate: 2023-09-14 14:38:07 +0000
Commit:     Doug Rabson <dfr@FreeBSD.org>
CommitDate: 2023-09-14 15:50:40 +0000

    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
---
 UPDATING                  | 4 ++++
 share/man/man5/src.conf.5 | 4 ++--
 share/mk/bsd.opts.mk      | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/UPDATING b/UPDATING
index 59788ab2c15d..b1276bfe83f6 100644
--- a/UPDATING
+++ b/UPDATING
@@ -27,6 +27,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW:
 	world, or to merely disable the most expensive debugging functionality
 	at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20230914:
+	Enable splitting out pkgbase manpages into separate packages by
+	default. To disable this, set WITHOUT_MANSPLITPKG=yes in src.conf.
+
 20230909:
 	Enable vnet sysctl variables to be loader tunable. SYSCTLs which
 	belongs to VNETs can be initialized during early boot or module
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index a5e7c501825a..64f725c7b2fa 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1152,8 +1152,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 93b0e7184b6d..51260533e265 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 \
@@ -76,7 +77,6 @@ __DEFAULT_NO_OPTIONS = \
     CCACHE_BUILD \
     CTF \
     INSTALL_AS_USER \
-    MANSPLITPKG \
     PROFILE \
     RETPOLINE \
     STALE_STAGED \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202309141551.38EFpFJF074783>