The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=87121747de001666a42bb2e7ba824331280d226a
commit 87121747de001666a42bb2e7ba824331280d226a Author: Lexi Winter <[email protected]> AuthorDate: 2025-11-06 14:31:58 +0000 Commit: Lexi Winter <[email protected]> CommitDate: 2025-11-06 15:20:52 +0000 periodic: Move 320.whatis to the mandoc package This periodic script only makes sense if mandoc is installed, so move it to the mandoc package like other periodic scripts. /usr/libexec/makewhatis.local only exists for the enjoyment of this script, and doesn't work without mandoc installed, so move that as well. This change moves files between packages so, until we have a proper policy on how to handle this in release/stable branches, it should not be MFC'd. MFC after: never Reviewed by: ziaee, manu Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53609 --- libexec/makewhatis.local/Makefile | 1 + usr.sbin/periodic/etc/weekly/Makefile | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libexec/makewhatis.local/Makefile b/libexec/makewhatis.local/Makefile index 765036623d49..b541dc8e4de1 100644 --- a/libexec/makewhatis.local/Makefile +++ b/libexec/makewhatis.local/Makefile @@ -1,3 +1,4 @@ +PACKAGE= mandoc SCRIPTS= makewhatis.local.sh MAN= makewhatis.local.8 SCRIPTSDIR= ${LIBEXECDIR} diff --git a/usr.sbin/periodic/etc/weekly/Makefile b/usr.sbin/periodic/etc/weekly/Makefile index d194a988acf0..a5483534c029 100644 --- a/usr.sbin/periodic/etc/weekly/Makefile +++ b/usr.sbin/periodic/etc/weekly/Makefile @@ -8,12 +8,11 @@ CONFS= 340.noid \ # NB: keep these sorted by MK_* knobs -.if ${MK_LOCATE} != "no" -CONFS+= 310.locate -.endif +CONFGROUPS.${MK_LOCATE}+= LOCATE +LOCATE= 310.locate -.if ${MK_MAN_UTILS} != "no" -CONFS+= 320.whatis -.endif +CONFGROUPS.${MK_MAN_UTILS}+= WHATIS +WHATISPACKAGE= mandoc +WHATIS= 320.whatis .include <bsd.prog.mk>
