git: 4ca5df80393e - main - Sort MK_BSD_CPIO before MK_BSDINSTALL

The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/src/commit/?id=4ca5df80393e1f2bf6ac26af42fc7246acb59f71

commit 4ca5df80393e1f2bf6ac26af42fc7246acb59f71
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2023-11-09 00:54:22 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2023-11-14 16:49:41 +0000

    Sort MK_BSD_CPIO before MK_BSDINSTALL
    
    Using sort(1) order makes verification of the sort easier.
    
    Reviewed by:    emaste, imp, netchild
    Pull Request:   https://github.com/freebsd/freebsd-src/pull/896
---
 tools/build/mk/OptionalObsoleteFiles.inc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 5335e5ea4ffc..f00c1b26a82c 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -395,13 +395,6 @@ OLD_FILES+=usr/sbin/bootptest
 OLD_FILES+=usr/share/man/man8/bootptest.8.gz
 .endif
 
-.if ${MK_BSD_CPIO} == no
-OLD_FILES+=usr/bin/bsdcpio
-OLD_FILES+=usr/bin/cpio
-OLD_FILES+=usr/share/man/man1/bsdcpio.1.gz
-OLD_FILES+=usr/share/man/man1/cpio.1.gz
-.endif
-
 .if ${MK_BSDINSTALL} == no
 OLD_FILES+=usr/libexec/bsdinstall/adduser
 OLD_FILES+=usr/libexec/bsdinstall/auto
@@ -440,6 +433,13 @@ OLD_FILES+=usr/share/man/man8/sade.8.gz
 OLD_DIRS+=usr/libexec/bsdinstall
 .endif
 
+.if ${MK_BSD_CPIO} == no
+OLD_FILES+=usr/bin/bsdcpio
+OLD_FILES+=usr/bin/cpio
+OLD_FILES+=usr/share/man/man1/bsdcpio.1.gz
+OLD_FILES+=usr/share/man/man1/cpio.1.gz
+.endif
+
 .if ${MK_BSNMP} == no
 OLD_FILES+=etc/snmpd.config
 OLD_FILES+=etc/rc.d/bsnmpd