git: 68aebfa28a17 - main - style.Makefile(5): update recommendations

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

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

commit 68aebfa28a17189e1e697e612c0a1a2220b9fa2b
Author:     Enji Cooper <ngie@FreeBSD.org>
AuthorDate: 2026-10-29 20:47:36 +0000
Commit:     Enji Cooper <ngie@FreeBSD.org>
CommitDate: 2026-10-29 23:31:58 +0000

    style.Makefile(5): update recommendations
    
    - Mention `CXXFLAGS` and `CXXSTD`, in addition to `CFLAGS` and `CSTD`.
    - Mention `LIBADD`, in addition to the legacy (in-tree) variables,
      `DPADD` and `LDADD`.
    - Mention the other option types, e.g., `MK_FOO`, `WITHOUT_FOO`, etc,
      added as part of `src.opts.mk` in the past couple releases.
    
    Bump .Dd for the change.
    
    MFC after:      1 week
---
 share/man/man5/style.Makefile.5 | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/share/man/man5/style.Makefile.5 b/share/man/man5/style.Makefile.5
index 8537c4428d88..f28c7f4af777 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, 2025
+.Dd October 29, 2026
 .Dt STYLE.MAKEFILE 5
 .Os
 .Sh NAME
@@ -70,9 +70,12 @@ order is:
 .Va SRCS
 .Va WARNS
 .Va CSTD
+.Va CXXSTD
 .Va CFLAGS
+.Va CXXFLAGS
 .Va DPADD
-.Va LDADD .
+.Va LDADD
+.Va LIBADD .
 The general
 .Dq build
 order is:
@@ -80,9 +83,12 @@ 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
@@ -229,13 +235,22 @@ To not build the
 .Dq foo
 part of the base system,
 use
-.Va NO_FOO ,
+.Va WITHOUT_FOO
+or
+.Dv MK_FOO=no ,
 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