From 3182fd63c405644d35360b71c2f98bca927c4c04 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 6 Feb 2018 23:12:16 +0000
Subject: [PATCH] Avoid find -s, use find | sort instead.

find -s was introduced to make the metalog more
deterministic. However, find -s is not portable. find | sort is
portable and accomplishes the same goals, even if it isn't
pedantically the same. TZS is the same before / after the change so
any fussy differences between the two are moot and there won't be
METALOG churn across this change.

Differential Revision: https://reviews.freebsd.org/D14231
---
 share/zoneinfo/Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile
index fbe47ff570a..6b06d6913d6 100644
--- a/share/zoneinfo/Makefile
+++ b/share/zoneinfo/Makefile
@@ -95,8 +95,13 @@ zoneinfo: yearistype ${TDATA}
 	zic -D -d ${TZBUILDDIR} -p ${POSIXRULES} -m ${NOBINMODE} \
 	    ${LEAPFILE} -y ${.OBJDIR}/yearistype ${TZFILES}
 
+#
+# Sort TZS to ensure they are the same every build. find -s might
+# be a shorter way to express this, but it's non-portable. Any
+# differences between the two don't matter for this purpose.
+#
 .if make(*install*)
-TZS!= cd ${TZBUILDDIR} && find -s * -type f
+TZS!= cd ${TZBUILDDIR} && find * -type f | env LC_ALL=C sort
 .endif
 
 beforeinstall: install-zoneinfo