From 65bae9164aeff15770f6e1410641f25d16188685 Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 18 Dec 2016 01:52:16 +0000
Subject: [PATCH] Prepare import of CLDR v30.3 and unicode 9.0.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Upstream kk_Cyrl_KZ has been renamed kk_KZ
Upstream mn_Cyrl_MN has been renamed mn_MN

For ru_RU: the default currency for unicode is now ₽ which is not mapped to
other encoding, add charmaps entries to be able to generate them
---
 tools/tools/locale/Makefile         | 2 +-
 tools/tools/locale/etc/charmaps.xml | 6 ++++--
 tools/tools/locale/etc/unicode.conf | 6 ++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/tools/tools/locale/Makefile b/tools/tools/locale/Makefile
index 0776b601af6..4937a7131bd 100644
--- a/tools/tools/locale/Makefile
+++ b/tools/tools/locale/Makefile
@@ -118,7 +118,7 @@ BASE_LOCALES_OF_INTEREST?= \
 	nb_NO nl_BE nl_NL nn_NO pl_PL pt_BR pt_PT ro_RO \
 	ru_RU se_FI se_NO sk_SK sl_SI sv_FI sv_SE tr_TR \
 	uk_UA \
-	kk_Cyrl_KZ mn_Cyrl_MN sr_Cyrl_RS sr_Latn_RS \
+	kk_KZ mn_MN sr_Cyrl_RS sr_Latn_RS \
 	zh_Hans_CN zh_Hant_HK zh_Hant_TW \
 	bn_IN gu_IN or_IN ta_IN te_IN kn_IN ml_IN si_LK \
 	th_TH lo_LA bo_IN my_MM pa_Guru_IN ka_GE chr_US \
diff --git a/tools/tools/locale/etc/charmaps.xml b/tools/tools/locale/etc/charmaps.xml
index e156ec3f01e..c1add0f9120 100644
--- a/tools/tools/locale/etc/charmaps.xml
+++ b/tools/tools/locale/etc/charmaps.xml
@@ -117,7 +117,6 @@
 		encoding="SJIS eucJP"
 		countries="JP" />
 	<language name="kk"
-		family="Cyrl"
 		countries="KZ" />  <!-- PT154 not available, UTF-8 -->
 	<language name="ko"
 		encoding="eucKR"
@@ -130,7 +129,6 @@
 		encoding="ISO8859-13"
 		countries="LV" />
 	<language name="mn"
-		family="Cyrl"
 		countries="MN" />
 	<language name="nb"
 		encoding="ISO8859-1 ISO8859-15"
@@ -393,6 +391,10 @@
 	<translation encoding="CP1251" cldr="HRYVNIA SIGN" hex="E3F0ED" />
 	<translation encoding="ISO8859-5" cldr="HRYVNIA SIGN" hex="D3E0DD" />
 	<translation encoding="KOI8-U" cldr="HRYVNIA SIGN" hex="C7D2CE" />
+	<translation encoding="CP866" cldr="RUBLE SIGN" hex="E0E3A1" />
+	<translation encoding="ISO8859-5" cldr="RUBLE SIGN" hex="E0E3D1" />
+	<translation encoding="CP1251" cldr="RUBLE SIGN" hex="E0E3D1" />
+	<translation encoding="KOI8-R" cldr="RUBLE SIGN" hex="D2D5C2" />
 
 	<!-- These don't have a special Kow sign so just use KRW for it -->
 	<translation encoding="CP949" cldr="WON SIGN" hex="5C" />
diff --git a/tools/tools/locale/etc/unicode.conf b/tools/tools/locale/etc/unicode.conf
index da1f19b931b..8d5e4e104d0 100644
--- a/tools/tools/locale/etc/unicode.conf
+++ b/tools/tools/locale/etc/unicode.conf
@@ -1,2 +1,4 @@
-cldr ~/unicode/cldr/27.0.1
-unidata ~/unicode/UNIDATA/8.0.0
+# $FreeBSD$
+
+cldr ~/unicode/cldr/30.0.3
+unidata ~/unicode/UNIDATA/9.0.0