From 084cbd8c7283952d68f2c40e27e900fe0af5d97e Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Thu, 9 Nov 2023 01:01:44 +0000 Subject: [PATCH] Sort MK_GNU_DIFF option Reviewed by: emaste, imp, netchild Pull Request: https://github.com/freebsd/freebsd-src/pull/896 (cherry picked from commit 2b3bf27da41f1481b2025445c6adf27f0d50de99) --- 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 f3122cfb198..41464fd7508 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2007,6 +2007,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 @@ -2162,11 +2167,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