git: 91d35fb663e0 - main - Remove WITHOUT_CAPSICUM build support

The branch main has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=91d35fb663e0276abc4963ae559e4759ea929842

commit 91d35fb663e0276abc4963ae559e4759ea929842
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2024-04-23 11:20:59 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-04-23 12:26:28 +0000

    Remove WITHOUT_CAPSICUM build support
    
    Capsicum is non-optional as of c24c117b9644 ("Remove
    WITHOUT_{CAPSICUM,CASPER} options").
    
    `#ifndef WITHOUT_CAPSICUM` is left in the source for the benefit of
    downstream consumers, but is never defined in FreeBSD.
    
    Reviewed by:    oshogbo
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D42077
---
 share/mk/src.opts.mk                 | 5 -----
 tools/build/options/WITHOUT_CAPSICUM | 1 -
 usr.bin/xz/Makefile                  | 4 ----
 3 files changed, 10 deletions(-)

diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 2ea0cbf24268..3d3a1299fac9 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -218,7 +218,6 @@ __DEFAULT_NO_OPTIONS = \
     ZONEINFO_LEAPSECONDS_SUPPORT \
 
 __REQUIRED_OPTIONS = \
-    CAPSICUM \
     CASPER
 
 # LEFT/RIGHT. Left options which default to "yes" unless their corresponding
@@ -383,10 +382,6 @@ BROKEN_OPTIONS+= TESTS
 # Force some options off if their dependencies are off.
 # Order is somewhat important.
 #
-.if ${MK_CAPSICUM} == "no"
-MK_CASPER:=	no
-.endif
-
 .if ${MK_SOURCELESS} == "no"
 MK_SOURCELESS_HOST:=	no
 MK_SOURCELESS_UCODE:= no
diff --git a/tools/build/options/WITHOUT_CAPSICUM b/tools/build/options/WITHOUT_CAPSICUM
deleted file mode 100644
index 19d821f6c981..000000000000
--- a/tools/build/options/WITHOUT_CAPSICUM
+++ /dev/null
@@ -1 +0,0 @@
-This option has no effect.
diff --git a/usr.bin/xz/Makefile b/usr.bin/xz/Makefile
index e3cbafb0ebc3..5b61202a981e 100644
--- a/usr.bin/xz/Makefile
+++ b/usr.bin/xz/Makefile
@@ -43,10 +43,6 @@ CFLAGS+=	-DHAVE_CONFIG_H \
 		-I${LZMALIBDIR} \
 		-I${XZDIR}/common
 
-.if ${MK_CAPSICUM} == "no"
-CFLAGS+=	-DWITHOUT_CAPSICUM
-.endif
-
 LIBADD=	lzma
 
 .include <bsd.prog.mk>