From owner-svn-src-head@freebsd.org  Sat Apr 16 17:44:37 2016
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 A8EBBB10479;
 Sat, 16 Apr 2016 17:44:37 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 78FFB1BFD;
 Sat, 16 Apr 2016 17:44:37 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3GHiaO8068083;
 Sat, 16 Apr 2016 17:44:36 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3GHiaPv068082;
 Sat, 16 Apr 2016 17:44:36 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201604161744.u3GHiaPv068082@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 16 Apr 2016 17:44:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298118 - head/tools/tools/locale/tools
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.21
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: Sat, 16 Apr 2016 17:44:37 -0000

Author: bapt
Date: Sat Apr 16 17:44:36 2016
New Revision: 298118
URL: https://svnweb.freebsd.org/changeset/base/298118

Log:
  Really stop converting map from UTF-8 to GB2312

Modified:
  head/tools/tools/locale/tools/finalize

Modified: head/tools/tools/locale/tools/finalize
==============================================================================
--- head/tools/tools/locale/tools/finalize	Sat Apr 16 17:39:39 2016	(r298117)
+++ head/tools/tools/locale/tools/finalize	Sat Apr 16 17:44:36 2016	(r298118)
@@ -61,7 +61,7 @@ then
 		${CLDRDIR}/posix/eucCN.cm \
 		> ${base}/../etc/final-maps/map.GB2312
 	CHARMAPS="ARMSCII-8 Big5 CP1131 CP1251 \
-		CP866 GB2312 GBK ISCII-DEV ISO8859-1 \
+		CP866 GBK ISCII-DEV ISO8859-1 \
 		ISO8859-13 ISO8859-15 ISO8859-2 ISO8859-4 \
 		ISO8859-5 ISO8859-7 ISO8859-9 KOI8-R KOI8-U \
 		PT154 SJIS US-ASCII eucJP eucKR"