Regenerate locales after readding ISO8859-1 for locales that have ISO8859-15

Requested by:	arche

4 files changed, 32 insertions, 4 deletions

diff --git a/share/ctypedef/Makefile b/share/ctypedef/Makefile
index 21d3820..56a5607 100644
--- a/share/ctypedef/Makefile
+++ b/share/ctypedef/Makefile
@@ -13,6 +13,7 @@ MAPLOC=		${.CURDIR}/../../tools/tools/locale/etc/final-maps
 	-i ${.IMPSRC} ${.OBJDIR}/${.IMPSRC:T:R}  || true
 
 LOCALES+=	be_BY.CP1131
+LOCALES+=	ca_IT.ISO8859-1
 LOCALES+=	ca_IT.ISO8859-15
 LOCALES+=	el_GR.ISO8859-7
 LOCALES+=	en_GB.ISO8859-15
@@ -117,21 +118,47 @@ SAME+=		en_US.UTF-8:ar_EG.UTF-8
 SAME+=		en_US.UTF-8:ar_AE.UTF-8
 SAME+=		en_US.UTF-8:am_ET.UTF-8
 SAME+=		en_US.UTF-8:af_ZA.UTF-8
+SAME+=		en_US.ISO8859-1:sv_SE.ISO8859-1
+SAME+=		en_US.ISO8859-1:sv_FI.ISO8859-1
+SAME+=		en_US.ISO8859-1:pt_PT.ISO8859-1
 SAME+=		en_US.ISO8859-1:pt_BR.ISO8859-1
+SAME+=		en_US.ISO8859-1:nn_NO.ISO8859-1
+SAME+=		en_US.ISO8859-1:nl_NL.ISO8859-1
+SAME+=		en_US.ISO8859-1:nl_BE.ISO8859-1
+SAME+=		en_US.ISO8859-1:nb_NO.ISO8859-1
+SAME+=		en_US.ISO8859-1:it_IT.ISO8859-1
+SAME+=		en_US.ISO8859-1:it_CH.ISO8859-1
+SAME+=		en_US.ISO8859-1:is_IS.ISO8859-1
+SAME+=		en_US.ISO8859-1:fr_FR.ISO8859-1
+SAME+=		en_US.ISO8859-1:fr_CH.ISO8859-1
 SAME+=		en_US.ISO8859-1:fr_CA.ISO8859-1
+SAME+=		en_US.ISO8859-1:fr_BE.ISO8859-1
+SAME+=		en_US.ISO8859-1:fi_FI.ISO8859-1
+SAME+=		en_US.ISO8859-1:eu_ES.ISO8859-1
+SAME+=		en_US.ISO8859-1:et_EE.ISO8859-1
 SAME+=		en_US.ISO8859-1:es_MX.ISO8859-1
+SAME+=		en_US.ISO8859-1:es_ES.ISO8859-1
 SAME+=		en_US.ISO8859-1:es_AR.ISO8859-1
 SAME+=		en_US.ISO8859-1:en_ZA.ISO8859-1
 SAME+=		en_US.ISO8859-1:en_SG.ISO8859-1
 SAME+=		en_US.ISO8859-1:en_NZ.ISO8859-1
+SAME+=		en_US.ISO8859-1:en_IE.ISO8859-1
 SAME+=		en_US.ISO8859-1:en_HK.ISO8859-1
+SAME+=		en_US.ISO8859-1:en_GB.ISO8859-1
 SAME+=		en_US.ISO8859-1:en_CA.ISO8859-1
 SAME+=		en_US.ISO8859-1:en_AU.ISO8859-1
+SAME+=		en_US.ISO8859-1:de_DE.ISO8859-1
+SAME+=		en_US.ISO8859-1:de_CH.ISO8859-1
+SAME+=		en_US.ISO8859-1:de_AT.ISO8859-1
+SAME+=		en_US.ISO8859-1:da_DK.ISO8859-1
 SAME+=		en_US.ISO8859-1:af_ZA.ISO8859-1
 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:be_BY.ISO8859-5
+SAME+=		ca_IT.ISO8859-1:ca_FR.ISO8859-1
+SAME+=		ca_IT.ISO8859-1:ca_ES.ISO8859-1
+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
@@ -184,22 +211,23 @@ SYMLINKS+=	../${f:C/:.*$//}/${FILESNAME} \
 FILESDIR_${f}.LC_CTYPE= ${LOCALEDIR}/${f}
 .endfor
 
+SYMPAIRS+=	ca_IT.ISO8859-1.src:ca_IT.ISO8859-15.src
 SYMPAIRS+=	be_BY.CP1131.src:ru_RU.CP1251.src
 SYMPAIRS+=	be_BY.CP1131.src:ru_RU.CP866.src
 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.GB18030.src:zh_Hans_CN.GB2312.src
-SYMPAIRS+=	zh_Hans_CN.GB18030.src:zh_Hans_CN.GBK.src
-SYMPAIRS+=	zh_Hans_CN.GB18030.src:zh_Hans_CN.eucCN.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_Hant_HK.Big5HKSCS.src:zh_Hant_TW.Big5.src
 SYMPAIRS+=	en_GB.ISO8859-15.src:en_US.ISO8859-1.src
 SYMPAIRS+=	en_GB.ISO8859-15.src:en_US.US-ASCII.src
 SYMPAIRS+=	en_GB.ISO8859-15.src:lv_LV.ISO8859-13.src
 SYMPAIRS+=	en_GB.ISO8859-15.src:sr_Latn_RS.ISO8859-2.src
 SYMPAIRS+=	en_GB.ISO8859-15.src:tr_TR.ISO8859-9.src
-SYMPAIRS+=	ja_JP.SJIS.src:ja_JP.eucJP.src
+SYMPAIRS+=	ja_JP.eucJP.src:ja_JP.SJIS.src
 
 .for PAIR in ${SYMPAIRS}
 ${PAIR:C/^.*://:S/src$/LC_CTYPE/}: ${PAIR:C/:.*//}
diff --git a/share/ctypedef/ca_IT.ISO8859-15.src b/share/ctypedef/ca_IT.ISO8859-1.src
index aa3608e..aa3608e 100644
--- a/share/ctypedef/ca_IT.ISO8859-15.src
+++ b/share/ctypedef/ca_IT.ISO8859-1.src
diff --git a/share/ctypedef/ja_JP.SJIS.src b/share/ctypedef/ja_JP.eucJP.src
index 73b93d8..73b93d8 100644
--- a/share/ctypedef/ja_JP.SJIS.src
+++ b/share/ctypedef/ja_JP.eucJP.src
diff --git a/share/ctypedef/zh_Hans_CN.GB18030.src b/share/ctypedef/zh_Hans_CN.eucCN.src
index e70b37b..e70b37b 100644
--- a/share/ctypedef/zh_Hans_CN.GB18030.src
+++ b/share/ctypedef/zh_Hans_CN.eucCN.src