Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 20 Oct 2023 14:14:15 GMT
From:      Doug Rabson <dfr@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 254f85f060d6 - stable/14 - pkgbase: Split out manpages by default
Message-ID:  <202310201414.39KEEFbc055153@gitrepo.freebsd.org>

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

URL: https://cgit.FreeBSD.org/src/commit/?id=254f85f060d6542bfcb5fafad9a0e0b7d76abc4b

commit 254f85f060d6542bfcb5fafad9a0e0b7d76abc4b
Author:     Doug Rabson <dfr@FreeBSD.org>
AuthorDate: 2023-09-14 14:38:07 +0000
Commit:     Doug Rabson <dfr@FreeBSD.org>
CommitDate: 2023-10-20 12:16:47 +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
    
    (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 4a8ce04b94e9..9858822f4071 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 82c8752722a1..b31d44abde9f 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 bb9fba38e5a6..b4761333d8c5 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 \



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