From nobody Fri Feb 13 19:26:07 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fCMbM390Pz6RfPm for ; Fri, 13 Feb 2026 19:26:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCMbM1bpBz3F9d for ; Fri, 13 Feb 2026 19:26:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771010767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5hn+4JJstBri5/KnWntOx5p9xyoW0fOVrrEeYvfwhno=; b=VQiOM/xS3wM1fz4gS1iRwg7YgbkmjWaUzANOrErWwgoRJyX6mVKYeb3EvVccBhz5kXotIx az4aywuy5uF/CdK1Sh94SVCKsj0gVdRj9E2q3mg213XUZr38UyXCPJfb62W1ZGPCGVJYYf RA28vvx859jW2IGYWHUBxs+nHBfaNtdpcOYkcqDj9CiinEZYcffccZogiGgJS8V94xGeRJ 8aUfTEczYk/dfXXOvcGg6bkHuTTgvaYQRwAfkmykl6+GQiaRSNLyFSqkIvUBDdrjPs6atY q7kkROPRcFt0V3kPLbGcIfMqImKitPSV243PSgNW2tM5uCXbqi3PUTUXH0b3bA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771010767; a=rsa-sha256; cv=none; b=fisxOroLsQ1oDOUoG7es0Hq8SLh8YAjHJF/bfH9s1hcWpz8aMPkp5Qu4SNJh6YenPHr2cR /LwFSQGpSxsSEG6F5Gq/N8VygpJzxMsZhjqB+bfcOhHwL3OIYmxNEPQw15wRhGCTtk8FiL 71kEJyJTbyPlIFrtjlkaKwotMhDdPvprxlHXuzsZbmUxVD1nZzQR4yWyh5xQxq8oZCaMSr IaBSbDbLjuN/rU8ANVnpZTZfr2SWrhi1LkoBC0bqCJ1bn7sSfCiJqbDWXbD9slGejTICI0 BEJUpJBDc7TMaBmHjNHsVT0XpSKH7JfDFoFHNTYcEVkZ1cFYDLAW8+0eFZc0mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771010767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5hn+4JJstBri5/KnWntOx5p9xyoW0fOVrrEeYvfwhno=; b=LKxeItItPnZ6gUVucIPP0nJ2xb6NOz64kuNLhU0C/1fRBCl5JFubIZNRvaeYMWkABEXyqC aZeEmEyhf0ek0VbRvcFWUIFA7Uge9lEJTRe5Gukwk3LyMF9vOgmniScGiiaiZw6qluO/IN lL3VumY4pUsfVwwPVBDdbWDSNGKlGWNZ75xeZViaz0X2RU6TuzdD74XGtGUOfgoDJ5V7JZ aoPbwT7IQgGQJGkKOfYEZT1A28wTd/BUKpk5rdTMrlktihCTq3+zzCKJIC0AiaoSHrp9/2 W9ZmSUXVCF61no2lvYTCayrCZV6pfEL1Xtt2fizDDfTcgrurBQcW9SRcNMwxIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCMbM10BYzbGb for ; Fri, 13 Feb 2026 19:26:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ecd5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 19:26:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 06d07d4af1c9 - main - src.conf.5: regenerate after switch to BSD diff3 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 06d07d4af1c9f9ea322b9363d1c8e70e250a7907 Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 19:26:07 +0000 Message-Id: <698f7acf.3ecd5.5f972a5@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=06d07d4af1c9f9ea322b9363d1c8e70e250a7907 commit 06d07d4af1c9f9ea322b9363d1c8e70e250a7907 Author: Baptiste Daroussin AuthorDate: 2026-02-13 17:44:26 +0000 Commit: Baptiste Daroussin 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 ,