From nobody Fri Oct 04 23:06:35 2024 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 4XL4180PKKz5YTr5; Fri, 04 Oct 2024 23:06:36 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XL41771mVz4hbD; Fri, 4 Oct 2024 23:06:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728083196; 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=Kb+DZ9R3DYeEGmpy5m31rXsTdlvsK3P7SGKexHhL/Ow=; b=CIUadnRqqaEhPDCzKnyeX6RdrCryoAfm19Uurex8V0CS3viAM+AAOoW6qLaPBmzgVePtpr Q2txIJ/+cvm+Qt6m8SfKa7UTtq+tSYXSWGrAZTLVAhy8Ui2ZsPTEPSWUHFgyLApQDkY6v/ 19Z/Dm122BDu8dljA1PQ87ozqERGUj/OycRJmnvE2QQ9Lu4rFz8mBMCfgDwSWR3AX9vPwH 5dJZbjiEWDtTo9dyeCdAE9k7bxNrznZDkQF3g+sAl+bRz+unIjjD4OU6hDOv+mYB0D5yMv /qACgylAS/6qVmEJB1M6Cnqbexyurj3rgsfGrsAzwipGUzGcxb0vrMUo64NTAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728083196; 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=Kb+DZ9R3DYeEGmpy5m31rXsTdlvsK3P7SGKexHhL/Ow=; b=b8ZzldPUDNLiRj8tgtgC/G427t26tkfmnaOjNUr/RL9nhDmgoX5GEWbckZbuXD/RjR/QYZ kKFJyM3Z24KK7URgjjbZFqKx3rWSzInIo5G4YZN+5FWmrXq1f79GqXz1PhSlcatdgEW7aT EGhAdKFRehodEEalI5DksA8yrxYxSHs3sciGkcwRPUyj+pL3YXNp2HboDBzAPqnCCBLEAA FUKO116zOHpcGtScN1QbjYhmVSYuEIYZs/IB6aDs5j3ibdcv1A8ZcLFn+gSisZUFOOsG9R a5l34sB0yuBUhDOot9d5XMygVnlK7o+PE0TJ+5ooniYVX/sAA4O7AYtD2j5XUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728083196; a=rsa-sha256; cv=none; b=rBKaFPGKduj7vUHdokQu2hYOchvc85PZcv4CF0ZO6GgOFmWMeXlvBesW7CyWAkQMjyQoVq IWTKyYBgSRBxpFsY5C/u0xJzxFP3/wv7Uyk+8NSArILVNq9MJbb1Ngx7UrLHhoj1i4Xb+e xpL3nMCKbrVUhwVfnUh+v6YdbAqCLAwzIt0Xmw9/AS1yOF4gxKZE4hzC64nthG4B8FDoSt pCWSrX/UplwIPo/jKPKya0tZDOMe3lkPDRXRvXsP58i0ueslzpFEOHwXI4qFvUbpmGUpF6 7HdkwLT/TBlIikDfe5L9ypvo+rWJtIbGM7EHNsG+ezNLDN2Ai7sFQEDJRcaixA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XL4176cq4ztbP; Fri, 4 Oct 2024 23:06:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 494N6ZHT077167; Fri, 4 Oct 2024 23:06:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 494N6Zas077164; Fri, 4 Oct 2024 23:06:35 GMT (envelope-from git) Date: Fri, 4 Oct 2024 23:06:35 GMT Message-Id: <202410042306.494N6Zas077164@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 77fd02501f09 - main - src.conf.5: regen after diff3 changes 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 77fd02501f0966ef54eb4a42e086a61a48134c42 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=77fd02501f0966ef54eb4a42e086a61a48134c42 commit 77fd02501f0966ef54eb4a42e086a61a48134c42 Author: Brooks Davis AuthorDate: 2024-10-04 22:01:03 +0000 Commit: Brooks Davis CommitDate: 2024-10-04 22:01:03 +0000 src.conf.5: regen after diff3 changes Fixes: 2201f7c49f11 Build BSD diff3 if GNU diff3 is disabled. --- share/man/man5/src.conf.5 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index c259e05af807..72ca14b8eae8 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 September 26, 2024 +.Dd October 4, 2024 .Dt SRC.CONF 5 .Os .Sh NAME @@ -720,7 +720,10 @@ and programs instead of the enhanced versions. .It Va WITHOUT_GNU_DIFF Do not build GNU -.Xr diff3 1 . +.Xr diff3 1 ; +build BSD +.Xr diff3 1 +instead. .It Va WITHOUT_GOOGLETEST Neither build nor install .Lb libgmock ,