git: aad600e52e8b - main - Remove WITH(OUT)_ATM option

The branch main has been updated by brooks:

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

commit aad600e52e8b34af3b88de0196c8a6df961c4e40
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2023-03-09 18:04:36 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2023-03-09 18:09:18 +0000

    Remove WITH(OUT)_ATM option
    
    With the removal of NgATM it no longer controls anything.
    
    Reviewed by:    manu, emaste
    Sponsored by:   DARPA
    Differential Revision:  https://reviews.freebsd.org/D38882
---
 share/man/man5/src.conf.5           | 6 +-----
 share/mk/src.opts.mk                | 2 --
 tools/build/options/WITHOUT_ATM     | 3 ---
 tools/build/options/WITH_ATM        | 1 -
 tools/tools/nanobsd/dhcpd/common    | 1 -
 tools/tools/nanobsd/embedded/common | 1 -
 6 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index 0615afd8dead..a05987e1a492 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 8, 2023
+.Dd March 9, 2023
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -126,8 +126,6 @@ checks.
 Do not build
 .Xr at 1
 and related utilities.
-.It Va WITH_ATM
-Build ATM Libraries and related programs.
 .It Va WITHOUT_AUDIT
 Do not build audit support into system programs.
 .It Va WITHOUT_AUTHPF
@@ -1204,8 +1202,6 @@ When set, it enforces these options:
 .Pp
 .Bl -item -compact
 .It
-.Va WITHOUT_ATM
-.It
 .Va WITHOUT_BLUETOOTH
 .El
 .Pp
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index d8cadd43a88b..7e477a24c61b 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -192,7 +192,6 @@ __DEFAULT_YES_OPTIONS = \
     ZONEINFO
 
 __DEFAULT_NO_OPTIONS = \
-    ATM \
     BEARSSL \
     BHYVE_SNAPSHOT \
     CLANG_EXTRAS \
@@ -405,7 +404,6 @@ MK_DMAGENT:=	no
 .endif
 
 .if ${MK_NETGRAPH} == "no"
-MK_ATM:=	no
 MK_BLUETOOTH:=	no
 .endif
 
diff --git a/tools/build/options/WITHOUT_ATM b/tools/build/options/WITHOUT_ATM
deleted file mode 100644
index 345663fb3ccd..000000000000
--- a/tools/build/options/WITHOUT_ATM
+++ /dev/null
@@ -1,3 +0,0 @@
-.\" $FreeBSD$
-Do not build
-programs and libraries related to ATM networking.
diff --git a/tools/build/options/WITH_ATM b/tools/build/options/WITH_ATM
deleted file mode 100644
index dcd47b23d63c..000000000000
--- a/tools/build/options/WITH_ATM
+++ /dev/null
@@ -1 +0,0 @@
-Build ATM Libraries and related programs.
diff --git a/tools/tools/nanobsd/dhcpd/common b/tools/tools/nanobsd/dhcpd/common
index dbd570d5e3c7..0bfe1993fc13 100644
--- a/tools/tools/nanobsd/dhcpd/common
+++ b/tools/tools/nanobsd/dhcpd/common
@@ -100,7 +100,6 @@ export NANO_MAKEFS
 
 CONF_BUILD="
 WITHOUT_ACPI=true
-WITHOUT_ATM=true
 WITHOUT_AUDIT=true
 WITHOUT_BLUETOOTH=true
 WITHOUT_CALENDAR=true
diff --git a/tools/tools/nanobsd/embedded/common b/tools/tools/nanobsd/embedded/common
index 37d7421a9a58..ba7ac643820e 100644
--- a/tools/tools/nanobsd/embedded/common
+++ b/tools/tools/nanobsd/embedded/common
@@ -131,7 +131,6 @@ customize_cmd cust_install_machine_files
 CONF_BUILD="
 LOCAL_XTOOL_DIRS=usr.bin/mkimg
 WITHOUT_ACPI=true
-WITHOUT_ATM=true
 WITHOUT_AUDIT=true
 WITHOUT_BLUETOOTH=true
 WITHOUT_CALENDAR=true