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)

14 files changed, 14 insertions, 14 deletions

diff --git a/share/timedef/Makefile b/share/timedef/Makefile
index 686629143016..a1a211f31663 100644
--- a/share/timedef/Makefile
+++ b/share/timedef/Makefile
@@ -76,14 +76,14 @@ LOCALES+=	it_IT.UTF-8
 LOCALES+=	ja_JP.SJIS
 LOCALES+=	ja_JP.UTF-8
 LOCALES+=	ja_JP.eucJP
-LOCALES+=	kk_Cyrl_KZ.UTF-8
+LOCALES+=	kk_KZ.UTF-8
 LOCALES+=	ko_KR.UTF-8
 LOCALES+=	ko_KR.eucKR
 LOCALES+=	lt_LT.ISO8859-13
 LOCALES+=	lt_LT.UTF-8
 LOCALES+=	lv_LV.ISO8859-13
 LOCALES+=	lv_LV.UTF-8
-LOCALES+=	mn_Cyrl_MN.UTF-8
+LOCALES+=	mn_MN.UTF-8
 LOCALES+=	nb_NO.ISO8859-15
 LOCALES+=	nb_NO.UTF-8
 LOCALES+=	nl_BE.UTF-8
@@ -109,10 +109,10 @@ LOCALES+=	sk_SK.ISO8859-2
 LOCALES+=	sk_SK.UTF-8
 LOCALES+=	sl_SI.ISO8859-2
 LOCALES+=	sl_SI.UTF-8
-LOCALES+=	sr_Cyrl_RS.ISO8859-5
-LOCALES+=	sr_Cyrl_RS.UTF-8
-LOCALES+=	sr_Latn_RS.ISO8859-2
-LOCALES+=	sr_Latn_RS.UTF-8
+LOCALES+=	sr_RS.ISO8859-5
+LOCALES+=	sr_RS.UTF-8
+LOCALES+=	sr_RS.ISO8859-2
+LOCALES+=	sr_RS.UTF-8@latin
 LOCALES+=	sv_FI.ISO8859-15
 LOCALES+=	sv_FI.UTF-8
 LOCALES+=	sv_SE.ISO8859-15
@@ -123,13 +123,13 @@ LOCALES+=	uk_UA.CP1251
 LOCALES+=	uk_UA.ISO8859-5
 LOCALES+=	uk_UA.KOI8-U
 LOCALES+=	uk_UA.UTF-8
-LOCALES+=	zh_Hans_CN.GB2312
-LOCALES+=	zh_Hans_CN.GBK
-LOCALES+=	zh_Hans_CN.UTF-8
-LOCALES+=	zh_Hans_CN.eucCN
-LOCALES+=	zh_Hant_HK.UTF-8
-LOCALES+=	zh_Hant_TW.Big5
-LOCALES+=	zh_Hant_TW.UTF-8
+LOCALES+=	zh_CN.GB2312
+LOCALES+=	zh_CN.GBK
+LOCALES+=	zh_CN.UTF-8
+LOCALES+=	zh_CN.eucCN
+LOCALES+=	zh_HK.UTF-8
+LOCALES+=	zh_TW.Big5
+LOCALES+=	zh_TW.UTF-8
 
 
 
@@ -201,7 +201,7 @@ SAME+=		nn_NO.ISO8859-15 nn_NO.ISO8859-1
 SAME+=		pt_PT.ISO8859-15 pt_PT.ISO8859-1
 SAME+=		sv_FI.ISO8859-15 sv_FI.ISO8859-1
 SAME+=		sv_SE.ISO8859-15 sv_SE.ISO8859-1
-SAME+=		zh_Hans_CN.GBK zh_Hans_CN.GB18030
+SAME+=		zh_CN.GBK zh_CN.GB18030
 SAME+=		ko_KR.eucKR ko_KR.CP949	# legacy (same charset)
 
 FILES=		${LOCALES:S/$/.out/}
diff --git a/share/timedef/kk_Cyrl_KZ.UTF-8.src b/share/timedef/kk_KZ.UTF-8.src
index 822b1152b419..822b1152b419 100644
--- a/share/timedef/kk_Cyrl_KZ.UTF-8.src
+++ b/share/timedef/kk_KZ.UTF-8.src
diff --git a/share/timedef/mn_Cyrl_MN.UTF-8.src b/share/timedef/mn_MN.UTF-8.src
index fd4fa05309cb..fd4fa05309cb 100644
--- a/share/timedef/mn_Cyrl_MN.UTF-8.src
+++ b/share/timedef/mn_MN.UTF-8.src
diff --git a/share/timedef/sr_Latn_RS.ISO8859-2.src b/share/timedef/sr_RS.ISO8859-2.src
index c9254fc43b0f..c9254fc43b0f 100644
--- a/share/timedef/sr_Latn_RS.ISO8859-2.src
+++ b/share/timedef/sr_RS.ISO8859-2.src
diff --git a/share/timedef/sr_Cyrl_RS.ISO8859-5.src b/share/timedef/sr_RS.ISO8859-5.src
index 99e50b6c1375..99e50b6c1375 100644
--- a/share/timedef/sr_Cyrl_RS.ISO8859-5.src
+++ b/share/timedef/sr_RS.ISO8859-5.src
diff --git a/share/timedef/sr_Cyrl_RS.UTF-8.src b/share/timedef/sr_RS.UTF-8.src
index 096d92934c2c..096d92934c2c 100644
--- a/share/timedef/sr_Cyrl_RS.UTF-8.src
+++ b/share/timedef/sr_RS.UTF-8.src
diff --git a/share/timedef/sr_Latn_RS.UTF-8.src b/share/timedef/sr_RS.UTF-8@latin.src
index 2f22f70bf558..2f22f70bf558 100644
--- a/share/timedef/sr_Latn_RS.UTF-8.src
+++ b/share/timedef/sr_RS.UTF-8@latin.src
diff --git a/share/timedef/zh_Hans_CN.GB2312.src b/share/timedef/zh_CN.GB2312.src
index efa11cd40e15..efa11cd40e15 100644
--- a/share/timedef/zh_Hans_CN.GB2312.src
+++ b/share/timedef/zh_CN.GB2312.src
diff --git a/share/timedef/zh_Hans_CN.GBK.src b/share/timedef/zh_CN.GBK.src
index 9f5dd0f5a377..9f5dd0f5a377 100644
--- a/share/timedef/zh_Hans_CN.GBK.src
+++ b/share/timedef/zh_CN.GBK.src
diff --git a/share/timedef/zh_Hans_CN.UTF-8.src b/share/timedef/zh_CN.UTF-8.src
index 9c994d445b39..9c994d445b39 100644
--- a/share/timedef/zh_Hans_CN.UTF-8.src
+++ b/share/timedef/zh_CN.UTF-8.src
diff --git a/share/timedef/zh_Hans_CN.eucCN.src b/share/timedef/zh_CN.eucCN.src
index 5589bf918881..5589bf918881 100644
--- a/share/timedef/zh_Hans_CN.eucCN.src
+++ b/share/timedef/zh_CN.eucCN.src
diff --git a/share/timedef/zh_Hant_HK.UTF-8.src b/share/timedef/zh_HK.UTF-8.src
index afd32174da98..afd32174da98 100644
--- a/share/timedef/zh_Hant_HK.UTF-8.src
+++ b/share/timedef/zh_HK.UTF-8.src
diff --git a/share/timedef/zh_Hant_TW.Big5.src b/share/timedef/zh_TW.Big5.src
index 012b8702ea24..012b8702ea24 100644
--- a/share/timedef/zh_Hant_TW.Big5.src
+++ b/share/timedef/zh_TW.Big5.src
diff --git a/share/timedef/zh_Hant_TW.UTF-8.src b/share/timedef/zh_TW.UTF-8.src
index 9b8486556406..9b8486556406 100644
--- a/share/timedef/zh_Hant_TW.UTF-8.src
+++ b/share/timedef/zh_TW.UTF-8.src