git: 0d9676e1ca92 - main - mk: Disable blacklist when disabling blocklist

The branch main has been updated by jlduran:

URL: https://cgit.FreeBSD.org/src/commit/?id=0d9676e1ca92febd42fbebef8d6833a0939d3f7c

commit 0d9676e1ca92febd42fbebef8d6833a0939d3f7c
Author:     Jose Luis Duran <jlduran@FreeBSD.org>
AuthorDate: 2026-03-29 16:14:50 +0000
Commit:     Jose Luis Duran <jlduran@FreeBSD.org>
CommitDate: 2026-03-29 16:14:50 +0000

    mk: Disable blacklist when disabling blocklist
    
    WITHOUT_BLOCKLIST, when set, should enforce WITHOUT_BLACKLIST.
    This fixes the build when WITHOUT_BLOCKLIST=yes is set.
    
    Reported by:    ivy
    Reviewed by:    ivy
    Fixes:          7238317403b9 ("blocklist: Rename blacklist to blocklist")
    MFC after:      2 weeks
    Differential Revision:  https://reviews.freebsd.org/D56118
---
 share/man/man5/src.conf.5 | 19 ++++++++++++++++++-
 share/mk/src.opts.mk      |  8 ++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index ad503a132a2c..33ce061a1114 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1,5 +1,5 @@
 .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman.
-.Dd March 20, 2026
+.Dd March 28, 2026
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -259,9 +259,20 @@ Set this if you do not want to build
 .Xr blocklistd 8
 and
 .Xr blocklistctl 8 .
+When set, it enforces these options:
+.Pp
+.Bl -item -compact
+.It
+.Va WITHOUT_BLACKLIST
+.El
+.Pp
 When set, these options are also in effect:
 .Pp
 .Bl -inset -compact
+.It Va WITHOUT_BLACKLIST_SUPPORT
+(unless
+.Va WITH_BLACKLIST_SUPPORT
+is set explicitly)
 .It Va WITHOUT_BLOCKLIST_SUPPORT
 (unless
 .Va WITH_BLOCKLIST_SUPPORT
@@ -274,6 +285,12 @@ support, like
 .Xr fingerd 8
 and
 .Xr sshd 8 .
+When set, it enforces these options:
+.Pp
+.Bl -item -compact
+.It
+.Va WITHOUT_BLACKLIST_SUPPORT
+.El
 .It Va WITHOUT_BLUETOOTH
 Do not build Bluetooth related kernel modules, programs and libraries.
 .It Va WITHOUT_BOOT
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 1cadc8450de3..47538c138eb7 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -407,6 +407,14 @@ MK_BLOCKLIST:=	no
 MK_BLOCKLIST_SUPPORT:=	no
 .endif
 
+.if ${MK_BLOCKLIST} == "no"
+MK_BLACKLIST:=	no
+.endif
+
+.if ${MK_BLOCKLIST_SUPPORT} == "no"
+MK_BLACKLIST_SUPPORT:=	no
+.endif
+
 .if ${MK_CDDL} == "no"
 MK_CTF:=	no
 MK_DTRACE:=	no