Date: Fri, 13 Feb 2026 19:26:07 +0000 From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 06d07d4af1c9 - main - src.conf.5: regenerate after switch to BSD diff3 Message-ID: <698f7acf.3ecd5.5f972a5@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=06d07d4af1c9f9ea322b9363d1c8e70e250a7907 commit 06d07d4af1c9f9ea322b9363d1c8e70e250a7907 Author: Baptiste Daroussin <bapt@FreeBSD.org> AuthorDate: 2026-02-13 17:44:26 +0000 Commit: Baptiste Daroussin <bapt@FreeBSD.org> CommitDate: 2026-02-13 19:26:02 +0000 src.conf.5: regenerate after switch to BSD diff3 --- share/man/man5/src.conf.5 | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 48896e761822..a08636c24c2b 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 January 29, 2026 +.Dd February 13, 2026 .Dt SRC.CONF 5 .Os .Sh NAME @@ -530,12 +530,6 @@ CTF data encapsulates a reduced form of debugging information similar to DWARF and the venerable stabs and is required for DTrace. .It Va WITHOUT_CUSE Do not build CUSE-related programs and libraries. -When set, it enforces these options: -.Pp -.Bl -item -compact -.It -.Va WITHOUT_SOUND -.El .It Va WITHOUT_CXGBETOOL Do not build .Xr cxgbetool 8 @@ -769,12 +763,11 @@ Do not build or install .Xr ftp 1 . .It Va WITHOUT_GAMES Do not build games. -.It Va WITHOUT_GNU_DIFF -Do not build GNU -.Xr diff3 1 ; -build BSD +.It Va WITH_GNU_DIFF +Build and install GNU .Xr diff3 1 -instead. +instead of BSD +.Xr diff3 1 . .It Va WITHOUT_GOOGLETEST Neither build nor install .Lb libgmock ,home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?698f7acf.3ecd5.5f972a5>