3 files changed, 4 insertions, 10 deletions
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index a2c9164..6c4cf9e 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1,7 +1,7 @@
 .\" DO NOT EDIT-- this file is automatically generated.
 .\" from FreeBSD: stable/10/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des
 .\" $FreeBSD$
-.Dd December 9, 2013
+.Dd January 27, 2014
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -113,9 +113,6 @@ checks.
 Set to not build
 .Xr at 1
 and related utilities.
-.It Va WITHOUT_ATF
-.\" from FreeBSD: stable/10/tools/build/options/WITHOUT_ATF 241823 2012-10-22 01:18:41Z marcel
-Set to not build programs and libraries related to the ATF testing framework.
 .It Va WITHOUT_ATM
 .\" from FreeBSD: stable/10/tools/build/options/WITHOUT_ATM 156932 2006-03-21 07:50:50Z ru
 Set to not build
@@ -624,9 +621,9 @@ and
 On amd64, set to not build 32-bit library set and a
 .Nm ld-elf32.so.1
 runtime linker.
-.It Va WITHOUT_LIBCPLUSPLUS
-.\" from FreeBSD: stable/10/tools/build/options/WITHOUT_LIBCPLUSPLUS 246262 2013-02-02 22:42:46Z dim
-Set to avoid building libcxxrt and libc++.
+.It Va WITH_LIBCPLUSPLUS
+.\" from FreeBSD: stable/10/tools/build/options/WITH_LIBCPLUSPLUS 228082 2011-11-28 17:56:46Z dim
+Set to build libcxxrt and libc++.
 .It Va WITHOUT_LIBPTHREAD
 .\" from FreeBSD: stable/10/tools/build/options/WITHOUT_LIBPTHREAD 188848 2009-02-20 11:09:55Z mtm
 Set to not build the
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index c292d6e..ab56beb 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -251,7 +251,6 @@ __DEFAULT_YES_OPTIONS = \
     ARM_EABI \
     ASSERT_DEBUG \
     AT \
-    ATF \
     ATM \
     AUDIT \
     AUTHPF \
diff --git a/tools/build/options/WITHOUT_ATF b/tools/build/options/WITHOUT_ATF
deleted file mode 100644
index 3ac5212..0000000
--- a/tools/build/options/WITHOUT_ATF
+++ /dev/null
@@ -1,2 +0,0 @@
-.\" $FreeBSD$
-Set to not build programs and libraries related to the ATF testing framework.