svn commit: r314532 - stable/11/usr.bin/vi/catalog

[Ed Maste]

Author: emaste
Date: Thu Mar  2 01:28:15 2017
New Revision: 314532
URL: https://svnweb.freebsd.org/changeset/base/314532

Log:
  MFC r314139: make vi message catalogues build independent of locale
  
  r275234 addressed sort automatically converting 8-bit locales to UTF-8
  by using "LANG=C sort", but LC_ALL overrides LANG if set, so the issue
  may still be present depending on the user's environment. Use LC_ALL=C
  instead.
  
  Reported by:	https://tests.reproducible-builds.org/
  Sponsored by:	The Linux Foundation / Core Infrastructure Initiative

Modified:
  stable/11/usr.bin/vi/catalog/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.bin/vi/catalog/Makefile
==============================================================================
--- stable/11/usr.bin/vi/catalog/Makefile	Thu Mar  2 01:23:17 2017	(r314531)
+++ stable/11/usr.bin/vi/catalog/Makefile	Thu Mar  2 01:28:15 2017	(r314532)
@@ -39,7 +39,7 @@ CAT+=	$c.UTF-8
 ${c}:	${c}.base 
 	echo "... $c";							\
 	rm -f $c;							\
-	env LANG=C sort -u ${.ALLSRC} |					\
+	env LC_ALL=C sort -u ${.ALLSRC} |				\
 	awk '{								\
 		if ($$1 == 1) {						\
 			print "\nMESSAGE NUMBER 1 IS NOT LEGAL";	\
@@ -86,13 +86,13 @@ ${c}.check: ${c}.base
 	echo =========================;					\
 	echo "MESSAGES WITH THE SAME MESSAGE ID's (FIX!):";		\
 	for j in							\
-	    `sed '/^$$/d' < $$f.base | LANG=C sort -u |			\
+	    `sed '/^$$/d' < $$f.base | LC_ALL=C sort -u |		\
 	    awk '{print $$1}' | uniq -d`; do				\
 		egrep $$j $$f.base;					\
 	done;								\
 	echo =========================;					\
 	echo "Duplicate messages, both id and message (this is okay):";	\
-	sed '/^$$/d' < $$f.base | LANG=C sort | uniq -c |			\
+	sed '/^$$/d' < $$f.base | LC_ALL=C sort | uniq -c |		\
 	awk '$$1 != 1 { print $$0 }' | sort -n;				\
 	echo =========================) > $c
 .endfor