git: 2b3bf27da41f - main - Sort MK_GNU_DIFF option

From: Brooks Davis <brooks_at_FreeBSD.org>
Date: Tue, 14 Nov 2023 16:52:02 UTC 
The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/src/commit/?id=2b3bf27da41f1481b2025445c6adf27f0d50de99

commit 2b3bf27da41f1481b2025445c6adf27f0d50de99
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2023-11-09 01:01:44 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2023-11-14 16:49:59 +0000

    Sort MK_GNU_DIFF option
    
    Reviewed by:    emaste, imp, netchild
    Pull Request:   https://github.com/freebsd/freebsd-src/pull/896
---
 tools/build/mk/OptionalObsoleteFiles.inc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 99e6ea1c8be3..c76313d173aa 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1993,6 +1993,11 @@ 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
@@ -2148,11 +2153,6 @@ OLD_FILES+=usr/share/man/man3/gpio_pin_tristate.3.gz
 OLD_FILES+=usr/share/man/man8/gpioctl.8.gz
 .endif
 
-.if ${MK_GNU_DIFF} == no
-OLD_FILES+=usr/bin/diff3
-OLD_FILES+=usr/share/man/man1/diff3.1.gz
-.endif
-
 .if ${MK_GSSAPI} == no
 OLD_FILES+=usr/include/gssapi/gssapi.h
 OLD_DIRS+=usr/include/gssapi