git: 105c49eb4a4b - main - Revert "style.Makefile(5): update recommendations"

From: Enji Cooper <ngie_at_FreeBSD.org>
Date: Thu, 29 Oct 2026 23:34:23 UTC
The branch main has been updated by ngie:

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

commit 105c49eb4a4bd1bd2b2c0af08dccb37b9b2b2fef
Author:     Enji Cooper <ngie@FreeBSD.org>
AuthorDate: 2026-10-29 23:33:51 +0000
Commit:     Enji Cooper <ngie@FreeBSD.org>
CommitDate: 2026-10-29 23:33:51 +0000

    Revert "style.Makefile(5): update recommendations"
    
    This has not been reviewed yet - revert the change so it can be reviewed
    properly first.
    
    This reverts commit 68aebfa28a17189e1e697e612c0a1a2220b9fa2b.
---
 share/man/man5/style.Makefile.5 | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/share/man/man5/style.Makefile.5 b/share/man/man5/style.Makefile.5
index f28c7f4af777..8537c4428d88 100644
--- a/share/man/man5/style.Makefile.5
+++ b/share/man/man5/style.Makefile.5
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd October 29, 2026
+.Dd October 29, 2025
 .Dt STYLE.MAKEFILE 5
 .Os
 .Sh NAME
@@ -70,12 +70,9 @@ order is:
 .Va SRCS
 .Va WARNS
 .Va CSTD
-.Va CXXSTD
 .Va CFLAGS
-.Va CXXFLAGS
 .Va DPADD
-.Va LDADD
-.Va LIBADD .
+.Va LDADD .
 The general
 .Dq build
 order is:
@@ -83,12 +80,9 @@ order is:
 .Va SRCS
 .Va WARNS
 .Va CSTD
-.Va CXXSTD
 .Va CFLAGS
-.Va CXXFLAGS
 .Va DPADD
 .Va LDADD
-.Va LIBADD
 .Va INCS
 .Va FILES
 .Va LINKS
@@ -235,22 +229,13 @@ To not build the
 .Dq foo
 part of the base system,
 use
-.Va WITHOUT_FOO
-or
-.Dv MK_FOO=no ,
+.Va NO_FOO ,
 not
-.Va NO_FOO
-or
 .Va NOFOO .
-The latter are reserved for the
-.Fx
-Ports Collection.
 .It
 To optionally build something in the base system,
 spell the knob
 .Va WITH_FOO
-or
-.Dv MK_FOO=yes ,
 not
 .Va WANT_FOO
 or