From owner-svn-src-head@freebsd.org  Thu Aug 27 14:00:17 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 92FDA9C2C3F;
 Thu, 27 Aug 2015 14:00:17 +0000 (UTC) (envelope-from kan@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8409B15D4;
 Thu, 27 Aug 2015 14:00:17 +0000 (UTC) (envelope-from kan@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7RE0Hks071301;
 Thu, 27 Aug 2015 14:00:17 GMT (envelope-from kan@FreeBSD.org)
Received: (from kan@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7RE0HiA071300;
 Thu, 27 Aug 2015 14:00:17 GMT (envelope-from kan@FreeBSD.org)
Message-Id: <201508271400.t7RE0HiA071300@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kan set sender to kan@FreeBSD.org
 using -f
From: Alexander Kabaev <kan@FreeBSD.org>
Date: Thu, 27 Aug 2015 14:00:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r287204 - head/usr.bin/vi/catalog
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Aug 2015 14:00:17 -0000

Author: kan
Date: Thu Aug 27 14:00:16 2015
New Revision: 287204
URL: https://svnweb.freebsd.org/changeset/base/287204

Log:
  Unbreak nvi message catalog generation for 8 bit locales.
  
  Feeding any file encoded in 8 bit locales such as KOI8-RU
  to sort utility running under UTF-8 locale produces astonishing
  result of recoding the output to UTF-8. To counter that, just
  run sort under 'C' locale for now.

Modified:
  head/usr.bin/vi/catalog/Makefile

Modified: head/usr.bin/vi/catalog/Makefile
==============================================================================
--- head/usr.bin/vi/catalog/Makefile	Thu Aug 27 13:17:05 2015	(r287203)
+++ head/usr.bin/vi/catalog/Makefile	Thu Aug 27 14:00:16 2015	(r287204)
@@ -32,9 +32,9 @@ CAT+=	$c.UTF-8
 
 .for c in ${CAT}
 ${c}:	${c}.base 
-	@echo "... $c";							\
+	echo "... $c";							\
 	rm -f $c;							\
-	sort -u ${.ALLSRC} |						\
+	env LANG=C sort -u ${.ALLSRC} |					\
 	awk '{								\
 		if ($$1 == 1) {						\
 			print "\nMESSAGE NUMBER 1 IS NOT LEGAL";	\
@@ -44,7 +44,7 @@ ${c}:	${c}.base 
 			print "DUPLICATE MESSAGE NUMBER " $$1;		\
 			exit 1;						\
 		}							\
-		print $0;						\
+		print $$0;						\
 	}' |								\
 	sed -e '1s/^/$$set 1~$$quote "~/; 1y/~/\n/' |			\
 	gencat $c /dev/stdin;						\