git: 2201f7c49f11 - main - Build BSD diff3 if GNU diff3 is disabled.

The branch main has been updated by des:

URL: https://cgit.FreeBSD.org/src/commit/?id=2201f7c49f11acc636d8d8be4b660a42a4ae4e58

commit 2201f7c49f11acc636d8d8be4b660a42a4ae4e58
Author:     Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2024-10-02 15:54:53 +0000
Commit:     Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2024-10-02 15:55:06 +0000

    Build BSD diff3 if GNU diff3 is disabled.
    
    MFC after:      3 weeks
    Sponsored by:   Klara, Inc.
    Reviewed by:    kevans
    Differential Revision:  https://reviews.freebsd.org/D46799
---
 tools/build/mk/OptionalObsoleteFiles.inc | 5 -----
 tools/build/options/WITHOUT_GNU_DIFF     | 5 ++++-
 tools/build/options/WITH_GNU_DIFF        | 2 ++
 usr.bin/Makefile                         | 3 +++
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index c0118bcbf6cb..121905ad9158 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -2073,11 +2073,6 @@ OLD_FILES+=usr/tests/usr.bin/dc/inout
 OLD_DIRS+=usr/tests/usr.bin/dc
 .endif
 
-.if ${MK_GNU_DIFF} == no
-OLD_FILES+=usr/bin/diff3
-OLD_FILES+=usr/share/man/man1/diff3.1.gz
-.endif
-
 .if ${MK_GOOGLETEST} == no
 OLD_FILES+=usr/include/private/gmock/gmock-actions.h
 OLD_FILES+=usr/include/private/gmock/gmock-cardinalities.h
diff --git a/tools/build/options/WITHOUT_GNU_DIFF b/tools/build/options/WITHOUT_GNU_DIFF
index 889e878668f6..4ea9f6f4a363 100644
--- a/tools/build/options/WITHOUT_GNU_DIFF
+++ b/tools/build/options/WITHOUT_GNU_DIFF
@@ -1,2 +1,5 @@
 Do not build GNU
-.Xr diff3 1 .
+.Xr diff3 1 ;
+build BSD
+.Xr diff3 1
+instead.
diff --git a/tools/build/options/WITH_GNU_DIFF b/tools/build/options/WITH_GNU_DIFF
index 6ccea1c7f28e..cc7fbf25119a 100644
--- a/tools/build/options/WITH_GNU_DIFF
+++ b/tools/build/options/WITH_GNU_DIFF
@@ -1,2 +1,4 @@
 Build and install GNU
+.Xr diff3 1
+instead of BSD
 .Xr diff3 1 .
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 039dd8ed2f87..88786a0dd7e0 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -212,6 +212,9 @@ SUBDIR+=		gh-bc
 SUBDIR.${MK_OPENSSL}+=	bc
 SUBDIR.${MK_OPENSSL}+=	dc
 .endif
+.if ${MK_GNU_DIFF} == "no"
+SUBDIR+=		diff3
+.endif
 SUBDIR.${MK_HESIOD}+=	hesinfo
 SUBDIR.${MK_ICONV}+=	iconv
 SUBDIR.${MK_ICONV}+=	mkcsmapper