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, 26 insertions, 26 deletions

diff --git a/share/ctypedef/Makefile b/share/ctypedef/Makefile
index d7f2cd1..dcc7708 100644
--- a/share/ctypedef/Makefile
+++ b/share/ctypedef/Makefile
@@ -30,29 +30,29 @@ LOCALES+=	ru_RU.CP1251
 LOCALES+=	ru_RU.CP866
 LOCALES+=	ru_RU.ISO8859-5
 LOCALES+=	ru_RU.KOI8-R
-LOCALES+=	sr_Latn_RS.ISO8859-2
+LOCALES+=	sr_RS.ISO8859-2
 LOCALES+=	tr_TR.ISO8859-9
 LOCALES+=	uk_UA.CP1251
 LOCALES+=	uk_UA.ISO8859-5
 LOCALES+=	uk_UA.KOI8-U
-LOCALES+=	zh_Hans_CN.GB18030
-LOCALES+=	zh_Hans_CN.GB2312
-LOCALES+=	zh_Hans_CN.GBK
-LOCALES+=	zh_Hans_CN.eucCN
-LOCALES+=	zh_Hant_TW.Big5
+LOCALES+=	zh_CN.GB18030
+LOCALES+=	zh_CN.GB2312
+LOCALES+=	zh_CN.GBK
+LOCALES+=	zh_CN.eucCN
+LOCALES+=	zh_TW.Big5
 
 
 
 SAME+=		en_US.UTF-8 ru_RU.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_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 uk_UA.UTF-8
 SAME+=		en_US.UTF-8 tr_TR.UTF-8
 SAME+=		en_US.UTF-8 sv_SE.UTF-8
 SAME+=		en_US.UTF-8 sv_FI.UTF-8
-SAME+=		en_US.UTF-8 sr_Latn_RS.UTF-8
-SAME+=		en_US.UTF-8 sr_Cyrl_RS.UTF-8
+SAME+=		en_US.UTF-8 sr_RS.UTF-8@latin
+SAME+=		en_US.UTF-8 sr_RS.UTF-8
 SAME+=		en_US.UTF-8 sl_SI.UTF-8
 SAME+=		en_US.UTF-8 sk_SK.UTF-8
 SAME+=		en_US.UTF-8 se_NO.UTF-8
@@ -65,11 +65,11 @@ SAME+=		en_US.UTF-8 nn_NO.UTF-8
 SAME+=		en_US.UTF-8 nl_NL.UTF-8
 SAME+=		en_US.UTF-8 nl_BE.UTF-8
 SAME+=		en_US.UTF-8 nb_NO.UTF-8
-SAME+=		en_US.UTF-8 mn_Cyrl_MN.UTF-8
+SAME+=		en_US.UTF-8 mn_MN.UTF-8
 SAME+=		en_US.UTF-8 lv_LV.UTF-8
 SAME+=		en_US.UTF-8 lt_LT.UTF-8
 SAME+=		en_US.UTF-8 ko_KR.UTF-8
-SAME+=		en_US.UTF-8 kk_Cyrl_KZ.UTF-8
+SAME+=		en_US.UTF-8 kk_KZ.UTF-8
 SAME+=		en_US.UTF-8 ja_JP.UTF-8
 SAME+=		en_US.UTF-8 it_IT.UTF-8
 SAME+=		en_US.UTF-8 it_CH.UTF-8
@@ -184,7 +184,7 @@ SAME+=		en_US.ISO8859-15 da_DK.ISO8859-15
 SAME+=		en_US.ISO8859-15 af_ZA.ISO8859-15
 SAME+=		ru_RU.CP1251 bg_BG.CP1251
 SAME+=		ru_RU.CP1251 be_BY.CP1251
-SAME+=		ru_RU.ISO8859-5 sr_Cyrl_RS.ISO8859-5
+SAME+=		ru_RU.ISO8859-5 sr_RS.ISO8859-5
 SAME+=		ru_RU.ISO8859-5 be_BY.ISO8859-5
 SAME+=		ca_IT.ISO8859-1 ca_FR.ISO8859-1
 SAME+=		ca_IT.ISO8859-1 ca_ES.ISO8859-1
@@ -192,13 +192,13 @@ SAME+=		ca_IT.ISO8859-1 ca_AD.ISO8859-1
 SAME+=		ca_IT.ISO8859-15 ca_FR.ISO8859-15
 SAME+=		ca_IT.ISO8859-15 ca_ES.ISO8859-15
 SAME+=		ca_IT.ISO8859-15 ca_AD.ISO8859-15
-SAME+=		sr_Latn_RS.ISO8859-2 sl_SI.ISO8859-2
-SAME+=		sr_Latn_RS.ISO8859-2 sk_SK.ISO8859-2
-SAME+=		sr_Latn_RS.ISO8859-2 ro_RO.ISO8859-2
-SAME+=		sr_Latn_RS.ISO8859-2 pl_PL.ISO8859-2
-SAME+=		sr_Latn_RS.ISO8859-2 hu_HU.ISO8859-2
-SAME+=		sr_Latn_RS.ISO8859-2 hr_HR.ISO8859-2
-SAME+=		sr_Latn_RS.ISO8859-2 cs_CZ.ISO8859-2
+SAME+=		sr_RS.ISO8859-2 sl_SI.ISO8859-2
+SAME+=		sr_RS.ISO8859-2 sk_SK.ISO8859-2
+SAME+=		sr_RS.ISO8859-2 ro_RO.ISO8859-2
+SAME+=		sr_RS.ISO8859-2 pl_PL.ISO8859-2
+SAME+=		sr_RS.ISO8859-2 hu_HU.ISO8859-2
+SAME+=		sr_RS.ISO8859-2 hr_HR.ISO8859-2
+SAME+=		sr_RS.ISO8859-2 cs_CZ.ISO8859-2
 SAME+=		en_US.US-ASCII en_ZA.US-ASCII
 SAME+=		en_US.US-ASCII en_NZ.US-ASCII
 SAME+=		en_US.US-ASCII en_GB.US-ASCII
@@ -226,15 +226,15 @@ SYMPAIRS+=	be_BY.CP1131.src ru_RU.ISO8859-5.src
 SYMPAIRS+=	be_BY.CP1131.src ru_RU.KOI8-R.src
 SYMPAIRS+=	uk_UA.CP1251.src uk_UA.ISO8859-5.src
 SYMPAIRS+=	uk_UA.CP1251.src uk_UA.KOI8-U.src
-SYMPAIRS+=	zh_Hans_CN.eucCN.src zh_Hans_CN.GB18030.src
-SYMPAIRS+=	zh_Hans_CN.eucCN.src zh_Hans_CN.GB2312.src
-SYMPAIRS+=	zh_Hans_CN.eucCN.src zh_Hans_CN.GBK.src
+SYMPAIRS+=	zh_CN.GB18030.src zh_CN.GB2312.src
+SYMPAIRS+=	zh_CN.GB18030.src zh_CN.GBK.src
+SYMPAIRS+=	zh_CN.GB18030.src zh_CN.eucCN.src
 SYMPAIRS+=	en_US.ISO8859-1.src en_US.ISO8859-15.src
 SYMPAIRS+=	en_US.ISO8859-1.src en_US.US-ASCII.src
 SYMPAIRS+=	en_US.ISO8859-1.src lv_LV.ISO8859-13.src
-SYMPAIRS+=	en_US.ISO8859-1.src sr_Latn_RS.ISO8859-2.src
+SYMPAIRS+=	en_US.ISO8859-1.src sr_RS.ISO8859-2.src
 SYMPAIRS+=	en_US.ISO8859-1.src tr_TR.ISO8859-9.src
-SYMPAIRS+=	ja_JP.eucJP.src ja_JP.SJIS.src
+SYMPAIRS+=	ja_JP.SJIS.src ja_JP.eucJP.src
 
 .for s t in ${SYMPAIRS}
 ${t:S/src$/LC_CTYPE/}: $s