From c24c117b96445ecdbd4bf9856f88118b376296c3 Mon Sep 17 00:00:00 2001
From: Colin Percival <cperciva@FreeBSD.org>
Date: Sat, 17 Jun 2023 17:03:56 -0700
Subject: [PATCH] Remove WITHOUT_{CAPSICUM,CASPER} options

At this point CAPSICUM and CASPER are merely forced on via the newly
added __REQUIRED_OPTIONS list; after stable/14 branches I'll sweep
the tree for MK_{CAPSICUM,CASPER}.

This change will not be MFCed.

Discussed on:	freebsd-arch
Differential Revision:	https://reviews.freebsd.org/D40592
---
 share/man/man5/src.conf.5            | 12 +-----------
 share/mk/src.opts.mk                 |  4 ++--
 tools/build/options/WITHOUT_CAPSICUM |  2 --
 tools/build/options/WITHOUT_CASPER   |  2 --
 4 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 tools/build/options/WITHOUT_CAPSICUM
 delete mode 100644 tools/build/options/WITHOUT_CASPER

diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index 08511661e328..815ffc62fc39 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 May 30, 2023
+.Dd June 17, 2023
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -260,19 +260,9 @@ Build some programs without optional bzip2 support.
 .It Va WITHOUT_CALENDAR
 Do not build
 .Xr calendar 1 .
-.It Va WITHOUT_CAPSICUM
-Do not build Capsicum support into system programs.
-When set, it enforces these options:
-.Pp
-.Bl -item -compact
-.It
-.Va WITHOUT_CASPER
-.El
 .It Va WITHOUT_CAROOT
 Do not add the trusted certificates from the Mozilla NSS bundle to
 base.
-.It Va WITHOUT_CASPER
-Do not build Casper program and related libraries.
 .It Va WITH_CCACHE_BUILD
 Use
 .Xr ccache 1
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 8120e23cb28b..3c17f9319619 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -76,9 +76,7 @@ __DEFAULT_YES_OPTIONS = \
     BSNMP \
     BZIP2 \
     CALENDAR \
-    CAPSICUM \
     CAROOT \
-    CASPER \
     CCD \
     CDDL \
     CLANG \
@@ -217,6 +215,8 @@ __DEFAULT_NO_OPTIONS = \
     ZONEINFO_LEAPSECONDS_SUPPORT \
 
 __REQUIRED_OPTIONS = \
+    CAPSICUM \
+    CASPER
 
 # LEFT/RIGHT. Left options which default to "yes" unless their corresponding
 # RIGHT option is disabled.
diff --git a/tools/build/options/WITHOUT_CAPSICUM b/tools/build/options/WITHOUT_CAPSICUM
deleted file mode 100644
index 9d0eb89e491d..000000000000
--- a/tools/build/options/WITHOUT_CAPSICUM
+++ /dev/null
@@ -1,2 +0,0 @@
-.\" $FreeBSD$
-Do not build Capsicum support into system programs.
diff --git a/tools/build/options/WITHOUT_CASPER b/tools/build/options/WITHOUT_CASPER
deleted file mode 100644
index 32bfa960d7d5..000000000000
--- a/tools/build/options/WITHOUT_CASPER
+++ /dev/null
@@ -1,2 +0,0 @@
-.\" $FreeBSD$
-Do not build Casper program and related libraries.