Posixify the locales name for variants

For all locales with variants:
- if no ambiguity on the locale (only one variant) just use the regular name
- if ambiguity, pick one as default and append @<variant> to the others
  respecting POSIX

As a result:
- All the 3 components locales added recently are renamed to the usual 2
  components version for all but sr_RS.UTF-8
- Set sr_RS.UTF-8 to the cyrillic variant
- Add sr_RS.UTF-8@latin
- Remove the symlinks aliases they were created to represent the 2 components
  version as aliasas and are now useless
- Update the OptionalObsoleteFiles.inc and ObsoleteFiles.inc to reflect those
  changes

Discussed with:	ache@
Approved by:	re@ (gjb)

1 files changed, 14 insertions, 14 deletions

diff --git a/share/numericdef/Makefile b/share/numericdef/Makefile
index 1205c12..3ff8484 100644
--- a/share/numericdef/Makefile
+++ b/share/numericdef/Makefile
@@ -22,9 +22,9 @@ LOCALES+=	tr_TR.UTF-8
 LOCALES+=	uk_UA.ISO8859-5
 LOCALES+=	uk_UA.KOI8-U
 LOCALES+=	uk_UA.UTF-8
-LOCALES+=	zh_Hans_CN.GB2312
-LOCALES+=	zh_Hans_CN.eucCN
-LOCALES+=	zh_Hant_TW.Big5
+LOCALES+=	zh_CN.GB2312
+LOCALES+=	zh_CN.eucCN
+LOCALES+=	zh_TW.Big5
 
 
 
@@ -74,7 +74,7 @@ SAME+=		uk_UA.UTF-8 nn_NO.UTF-8
 SAME+=		uk_UA.UTF-8 nb_NO.UTF-8
 SAME+=		uk_UA.UTF-8 lv_LV.UTF-8
 SAME+=		uk_UA.UTF-8 lt_LT.UTF-8
-SAME+=		uk_UA.UTF-8 kk_Cyrl_KZ.UTF-8
+SAME+=		uk_UA.UTF-8 kk_KZ.UTF-8
 SAME+=		uk_UA.UTF-8 hu_HU.UTF-8
 SAME+=		uk_UA.UTF-8 fr_FR.UTF-8
 SAME+=		uk_UA.UTF-8 fr_CA.UTF-8
@@ -85,12 +85,12 @@ SAME+=		uk_UA.UTF-8 cs_CZ.UTF-8
 SAME+=		uk_UA.UTF-8 bg_BG.UTF-8
 SAME+=		uk_UA.UTF-8 be_BY.UTF-8
 SAME+=		uk_UA.UTF-8 af_ZA.UTF-8
-SAME+=		en_US.UTF-8 zh_Hant_TW.UTF-8
-SAME+=		en_US.UTF-8 zh_Hant_HK.UTF-8
-SAME+=		en_US.UTF-8 zh_Hans_CN.UTF-8
-SAME+=		en_US.UTF-8 zh_Hans_CN.GBK
-SAME+=		en_US.UTF-8 zh_Hans_CN.GB18030
-SAME+=		en_US.UTF-8 mn_Cyrl_MN.UTF-8
+SAME+=		en_US.UTF-8 zh_TW.UTF-8
+SAME+=		en_US.UTF-8 zh_HK.UTF-8
+SAME+=		en_US.UTF-8 zh_CN.UTF-8
+SAME+=		en_US.UTF-8 zh_CN.GBK
+SAME+=		en_US.UTF-8 zh_CN.GB18030
+SAME+=		en_US.UTF-8 mn_MN.UTF-8
 SAME+=		en_US.UTF-8 ko_KR.UTF-8
 SAME+=		en_US.UTF-8 ko_KR.eucKR
 SAME+=		en_US.UTF-8 ja_JP.UTF-8
@@ -132,10 +132,10 @@ SAME+=		ar_SA.UTF-8 ar_JO.UTF-8
 SAME+=		ar_SA.UTF-8 ar_EG.UTF-8
 SAME+=		ar_SA.UTF-8 ar_AE.UTF-8
 SAME+=		tr_TR.UTF-8 tr_TR.ISO8859-9
-SAME+=		tr_TR.UTF-8 sr_Latn_RS.UTF-8
-SAME+=		tr_TR.UTF-8 sr_Latn_RS.ISO8859-2
-SAME+=		tr_TR.UTF-8 sr_Cyrl_RS.UTF-8
-SAME+=		tr_TR.UTF-8 sr_Cyrl_RS.ISO8859-5
+SAME+=		tr_TR.UTF-8 sr_RS.UTF-8@latin
+SAME+=		tr_TR.UTF-8 sr_RS.ISO8859-2
+SAME+=		tr_TR.UTF-8 sr_RS.UTF-8
+SAME+=		tr_TR.UTF-8 sr_RS.ISO8859-5
 SAME+=		tr_TR.UTF-8 sl_SI.UTF-8
 SAME+=		tr_TR.UTF-8 sl_SI.ISO8859-2
 SAME+=		tr_TR.UTF-8 ro_RO.UTF-8