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

diff --git a/share/colldef/Makefile b/share/colldef/Makefile
index 01578af..5cd981a 100644
--- a/share/colldef/Makefile
+++ b/share/colldef/Makefile
@@ -9,7 +9,7 @@ MAPLOC=		${.CURDIR}/../../tools/tools/locale/etc/final-maps
 
 .src.LC_COLLATE:
 	localedef -D -U -i ${.IMPSRC} \
-	-f ${MAPLOC}/map.${.TARGET:T:R:E} ${.OBJDIR}/${.IMPSRC:T:R}
+	-f ${MAPLOC}/map.${.TARGET:T:R:E:C/@.*//} ${.OBJDIR}/${.IMPSRC:T:R}
 
 LOCALES+=	af_ZA.UTF-8
 LOCALES+=	am_ET.UTF-8
@@ -30,7 +30,7 @@ LOCALES+=	hu_HU.UTF-8
 LOCALES+=	hy_AM.UTF-8
 LOCALES+=	is_IS.UTF-8
 LOCALES+=	ja_JP.UTF-8
-LOCALES+=	kk_Cyrl_KZ.UTF-8
+LOCALES+=	kk_KZ.UTF-8
 LOCALES+=	ko_KR.UTF-8
 LOCALES+=	lt_LT.UTF-8
 LOCALES+=	lv_LV.UTF-8
@@ -44,15 +44,15 @@ LOCALES+=	sl_SI.UTF-8
 LOCALES+=	sv_SE.UTF-8
 LOCALES+=	tr_TR.UTF-8
 LOCALES+=	uk_UA.UTF-8
-LOCALES+=	zh_Hans_CN.UTF-8
-LOCALES+=	zh_Hant_TW.UTF-8
+LOCALES+=	zh_CN.UTF-8
+LOCALES+=	zh_TW.UTF-8
 
 LOCALES_MAPPED+=	af_ZA.UTF-8 af_ZA.ISO8859-15
 LOCALES_MAPPED+=	af_ZA.UTF-8 af_ZA.ISO8859-1
 LOCALES_MAPPED+=	be_BY.UTF-8 be_BY.ISO8859-5
 LOCALES_MAPPED+=	be_BY.UTF-8 be_BY.CP1251
 LOCALES_MAPPED+=	be_BY.UTF-8 be_BY.CP1131
-LOCALES_MAPPED+=	ru_RU.UTF-8 sr_Cyrl_RS.ISO8859-5
+LOCALES_MAPPED+=	ru_RU.UTF-8 sr_RS.ISO8859-5
 LOCALES_MAPPED+=	ru_RU.UTF-8 ru_RU.KOI8-R
 LOCALES_MAPPED+=	ru_RU.UTF-8 ru_RU.ISO8859-5
 LOCALES_MAPPED+=	ru_RU.UTF-8 ru_RU.CP866
@@ -66,7 +66,8 @@ LOCALES_MAPPED+=	ca_AD.UTF-8 ca_ES.ISO8859-15
 LOCALES_MAPPED+=	ca_AD.UTF-8 ca_ES.ISO8859-1
 LOCALES_MAPPED+=	ca_AD.UTF-8 ca_AD.ISO8859-15
 LOCALES_MAPPED+=	ca_AD.UTF-8 ca_AD.ISO8859-1
-LOCALES_MAPPED+=	en_US.UTF-8 sr_Latn_RS.ISO8859-2
+LOCALES_MAPPED+=	en_US.UTF-8 sr_RS.UTF-8@latin
+LOCALES_MAPPED+=	en_US.UTF-8 sr_RS.ISO8859-2
 LOCALES_MAPPED+=	en_US.UTF-8 pt_PT.ISO8859-15
 LOCALES_MAPPED+=	en_US.UTF-8 pt_PT.ISO8859-1
 LOCALES_MAPPED+=	en_US.UTF-8 pt_BR.ISO8859-1
@@ -147,9 +148,9 @@ LOCALES_MAPPED+=	tr_TR.UTF-8 tr_TR.ISO8859-9
 LOCALES_MAPPED+=	uk_UA.UTF-8 uk_UA.KOI8-U
 LOCALES_MAPPED+=	uk_UA.UTF-8 uk_UA.ISO8859-5
 LOCALES_MAPPED+=	uk_UA.UTF-8 uk_UA.CP1251
-LOCALES_MAPPED+=	zh_Hans_CN.UTF-8 zh_Hans_CN.GBK
-LOCALES_MAPPED+=	zh_Hans_CN.UTF-8 zh_Hans_CN.GB18030
-LOCALES_MAPPED+=	zh_Hant_TW.UTF-8 zh_Hant_TW.Big5
+LOCALES_MAPPED+=	zh_CN.UTF-8 zh_CN.GBK
+LOCALES_MAPPED+=	zh_CN.UTF-8 zh_CN.GB18030
+LOCALES_MAPPED+=	zh_TW.UTF-8 zh_TW.Big5
 
 LOCALES+=	cs_CZ.ISO8859-2
 LOCALES+=	da_DK.ISO8859-1
@@ -159,8 +160,8 @@ LOCALES+=	hu_HU.ISO8859-2
 LOCALES+=	nb_NO.ISO8859-1
 LOCALES+=	nb_NO.ISO8859-15
 LOCALES+=	sk_SK.ISO8859-2
-LOCALES+=	zh_Hans_CN.GB2312
-LOCALES+=	zh_Hans_CN.eucCN
+LOCALES+=	zh_CN.GB2312
+LOCALES+=	zh_CN.eucCN
 
 
 SAME+=		ar_SA.UTF-8 ar_QA.UTF-8
@@ -168,13 +169,12 @@ SAME+=		ar_SA.UTF-8 ar_MA.UTF-8
 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+=		ru_RU.UTF-8 sr_Cyrl_RS.UTF-8
-SAME+=		ru_RU.UTF-8 mn_Cyrl_MN.UTF-8
+SAME+=		ru_RU.UTF-8 sr_RS.UTF-8
+SAME+=		ru_RU.UTF-8 mn_MN.UTF-8
 SAME+=		ru_RU.UTF-8 bg_BG.UTF-8
 SAME+=		ca_AD.UTF-8 ca_IT.UTF-8
 SAME+=		ca_AD.UTF-8 ca_FR.UTF-8
 SAME+=		ca_AD.UTF-8 ca_ES.UTF-8
-SAME+=		en_US.UTF-8 sr_Latn_RS.UTF-8
 SAME+=		en_US.UTF-8 pt_PT.UTF-8
 SAME+=		en_US.UTF-8 pt_BR.UTF-8
 SAME+=		en_US.UTF-8 nn_NO.UTF-8
@@ -204,7 +204,7 @@ SAME+=		es_MX.UTF-8 es_CR.UTF-8
 SAME+=		es_MX.UTF-8 es_AR.UTF-8
 SAME+=		se_NO.UTF-8 se_FI.UTF-8
 SAME+=		sv_SE.UTF-8 sv_FI.UTF-8
-SAME+=		zh_Hant_TW.UTF-8 zh_Hant_HK.UTF-8
+SAME+=		zh_TW.UTF-8 zh_HK.UTF-8
 SAME+=		ko_KR.eucKR ko_KR.CP949	# legacy (same charset)
 
 FILES=		${LOCALES:S/$/.LC_COLLATE/}
@@ -224,7 +224,7 @@ FILES+=	$t.LC_COLLATE
 FILESDIR_$t.LC_COLLATE=	${LOCALEDIR}/$t
 $t.LC_COLLATE: ${.CURDIR}/$f.src
 	localedef -D -U -i ${.ALLSRC} \
-		-f ${MAPLOC}/map.${.TARGET:T:R:E} \
+		-f ${MAPLOC}/map.${.TARGET:T:R:E:C/@.*//} \
 		${.OBJDIR}/${.TARGET:T:R}
 .endfor