Simplify the locale generated Makefiles by using bmake multi variables for loops

8 files changed, 826 insertions, 824 deletions

diff --git a/share/colldef/Makefile b/share/colldef/Makefile
index 6f48c01..ff400b1 100644
--- a/share/colldef/Makefile
+++ b/share/colldef/Makefile
@@ -47,170 +47,170 @@ LOCALES+=	uk_UA.UTF-8
 LOCALES+=	zh_Hans_CN.UTF-8
 LOCALES+=	zh_Hant_TW.UTF-8
 
-SAME+=		af_ZA.UTF-8:af_ZA.ISO8859-15
-SAME+=		af_ZA.UTF-8:af_ZA.ISO8859-1
-SAME+=		ar_SA.UTF-8:ar_QA.UTF-8
-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+=		be_BY.UTF-8:be_BY.ISO8859-5
-SAME+=		be_BY.UTF-8:be_BY.CP1251
-SAME+=		be_BY.UTF-8:be_BY.CP1131
-SAME+=		ru_RU.UTF-8:sr_Cyrl_RS.UTF-8
-SAME+=		ru_RU.UTF-8:sr_Cyrl_RS.ISO8859-5
-SAME+=		ru_RU.UTF-8:ru_RU.KOI8-R
-SAME+=		ru_RU.UTF-8:ru_RU.ISO8859-5
-SAME+=		ru_RU.UTF-8:ru_RU.CP866
-SAME+=		ru_RU.UTF-8:ru_RU.CP1251
-SAME+=		ru_RU.UTF-8:mn_Cyrl_MN.UTF-8
-SAME+=		ru_RU.UTF-8:bg_BG.UTF-8
-SAME+=		ru_RU.UTF-8:bg_BG.CP1251
-SAME+=		ca_AD.UTF-8:ca_IT.UTF-8
-SAME+=		ca_AD.UTF-8:ca_IT.ISO8859-15
-SAME+=		ca_AD.UTF-8:ca_IT.ISO8859-1
-SAME+=		ca_AD.UTF-8:ca_FR.UTF-8
-SAME+=		ca_AD.UTF-8:ca_FR.ISO8859-15
-SAME+=		ca_AD.UTF-8:ca_FR.ISO8859-1
-SAME+=		ca_AD.UTF-8:ca_ES.UTF-8
-SAME+=		ca_AD.UTF-8:ca_ES.ISO8859-15
-SAME+=		ca_AD.UTF-8:ca_ES.ISO8859-1
-SAME+=		ca_AD.UTF-8:ca_AD.ISO8859-15
-SAME+=		ca_AD.UTF-8:ca_AD.ISO8859-1
-SAME+=		cs_CZ.UTF-8:cs_CZ.ISO8859-2
-SAME+=		da_DK.UTF-8:da_DK.ISO8859-15
-SAME+=		da_DK.UTF-8:da_DK.ISO8859-1
-SAME+=		en_US.UTF-8:sr_Latn_RS.UTF-8
-SAME+=		en_US.UTF-8:sr_Latn_RS.ISO8859-2
-SAME+=		en_US.UTF-8:pt_PT.UTF-8
-SAME+=		en_US.UTF-8:pt_PT.ISO8859-15
-SAME+=		en_US.UTF-8:pt_PT.ISO8859-1
-SAME+=		en_US.UTF-8:pt_BR.UTF-8
-SAME+=		en_US.UTF-8:pt_BR.ISO8859-1
-SAME+=		en_US.UTF-8:nn_NO.UTF-8
-SAME+=		en_US.UTF-8:nn_NO.ISO8859-15
-SAME+=		en_US.UTF-8:nn_NO.ISO8859-1
-SAME+=		en_US.UTF-8:nl_NL.UTF-8
-SAME+=		en_US.UTF-8:nl_NL.ISO8859-15
-SAME+=		en_US.UTF-8:nl_NL.ISO8859-1
-SAME+=		en_US.UTF-8:nl_BE.UTF-8
-SAME+=		en_US.UTF-8:nl_BE.ISO8859-15
-SAME+=		en_US.UTF-8:nl_BE.ISO8859-1
-SAME+=		en_US.UTF-8:it_IT.UTF-8
-SAME+=		en_US.UTF-8:it_IT.ISO8859-15
-SAME+=		en_US.UTF-8:it_IT.ISO8859-1
-SAME+=		en_US.UTF-8:it_CH.UTF-8
-SAME+=		en_US.UTF-8:it_CH.ISO8859-15
-SAME+=		en_US.UTF-8:it_CH.ISO8859-1
-SAME+=		en_US.UTF-8:fr_FR.UTF-8
-SAME+=		en_US.UTF-8:fr_FR.ISO8859-15
-SAME+=		en_US.UTF-8:fr_FR.ISO8859-1
-SAME+=		en_US.UTF-8:fr_CH.UTF-8
-SAME+=		en_US.UTF-8:fr_CH.ISO8859-15
-SAME+=		en_US.UTF-8:fr_CH.ISO8859-1
-SAME+=		en_US.UTF-8:fr_CA.UTF-8
-SAME+=		en_US.UTF-8:fr_CA.ISO8859-15
-SAME+=		en_US.UTF-8:fr_CA.ISO8859-1
-SAME+=		en_US.UTF-8:fr_BE.UTF-8
-SAME+=		en_US.UTF-8:fr_BE.ISO8859-15
-SAME+=		en_US.UTF-8:fr_BE.ISO8859-1
-SAME+=		en_US.UTF-8:eu_ES.UTF-8
-SAME+=		en_US.UTF-8:eu_ES.ISO8859-15
-SAME+=		en_US.UTF-8:eu_ES.ISO8859-1
-SAME+=		en_US.UTF-8:en_ZA.UTF-8
-SAME+=		en_US.UTF-8:en_ZA.US-ASCII
-SAME+=		en_US.UTF-8:en_ZA.ISO8859-15
-SAME+=		en_US.UTF-8:en_ZA.ISO8859-1
-SAME+=		en_US.UTF-8:en_US.US-ASCII
-SAME+=		en_US.UTF-8:en_US.ISO8859-15
-SAME+=		en_US.UTF-8:en_US.ISO8859-1
-SAME+=		en_US.UTF-8:en_SG.UTF-8
-SAME+=		en_US.UTF-8:en_SG.ISO8859-1
-SAME+=		en_US.UTF-8:en_PH.UTF-8
-SAME+=		en_US.UTF-8:en_NZ.UTF-8
-SAME+=		en_US.UTF-8:en_NZ.US-ASCII
-SAME+=		en_US.UTF-8:en_NZ.ISO8859-15
-SAME+=		en_US.UTF-8:en_NZ.ISO8859-1
-SAME+=		en_US.UTF-8:en_IE.UTF-8
-SAME+=		en_US.UTF-8:en_IE.ISO8859-15
-SAME+=		en_US.UTF-8:en_IE.ISO8859-1
-SAME+=		en_US.UTF-8:en_HK.UTF-8
-SAME+=		en_US.UTF-8:en_HK.ISO8859-1
-SAME+=		en_US.UTF-8:en_GB.UTF-8
-SAME+=		en_US.UTF-8:en_GB.US-ASCII
-SAME+=		en_US.UTF-8:en_GB.ISO8859-15
-SAME+=		en_US.UTF-8:en_GB.ISO8859-1
-SAME+=		en_US.UTF-8:en_CA.UTF-8
-SAME+=		en_US.UTF-8:en_CA.US-ASCII
-SAME+=		en_US.UTF-8:en_CA.ISO8859-15
-SAME+=		en_US.UTF-8:en_CA.ISO8859-1
-SAME+=		en_US.UTF-8:en_AU.UTF-8
-SAME+=		en_US.UTF-8:en_AU.US-ASCII
-SAME+=		en_US.UTF-8:en_AU.ISO8859-15
-SAME+=		en_US.UTF-8:en_AU.ISO8859-1
-SAME+=		en_US.UTF-8:de_DE.UTF-8
-SAME+=		en_US.UTF-8:de_DE.ISO8859-15
-SAME+=		en_US.UTF-8:de_DE.ISO8859-1
-SAME+=		en_US.UTF-8:de_CH.UTF-8
-SAME+=		en_US.UTF-8:de_CH.ISO8859-15
-SAME+=		en_US.UTF-8:de_CH.ISO8859-1
-SAME+=		en_US.UTF-8:de_AT.UTF-8
-SAME+=		en_US.UTF-8:de_AT.ISO8859-15
-SAME+=		en_US.UTF-8:de_AT.ISO8859-1
-SAME+=		el_GR.UTF-8:el_GR.ISO8859-7
-SAME+=		es_MX.UTF-8:es_MX.ISO8859-1
-SAME+=		es_MX.UTF-8:es_ES.UTF-8
-SAME+=		es_MX.UTF-8:es_ES.ISO8859-15
-SAME+=		es_MX.UTF-8:es_ES.ISO8859-1
-SAME+=		es_MX.UTF-8:es_CR.UTF-8
-SAME+=		es_MX.UTF-8:es_AR.UTF-8
-SAME+=		es_MX.UTF-8:es_AR.ISO8859-1
-SAME+=		et_EE.UTF-8:et_EE.ISO8859-15
-SAME+=		et_EE.UTF-8:et_EE.ISO8859-1
-SAME+=		fi_FI.UTF-8:fi_FI.ISO8859-15
-SAME+=		fi_FI.UTF-8:fi_FI.ISO8859-1
-SAME+=		hi_IN.UTF-8:hi_IN.ISCII-DEV
-SAME+=		hr_HR.UTF-8:hr_HR.ISO8859-2
-SAME+=		hu_HU.UTF-8:hu_HU.ISO8859-2
-SAME+=		hy_AM.UTF-8:hy_AM.ARMSCII-8
-SAME+=		is_IS.UTF-8:is_IS.ISO8859-15
-SAME+=		is_IS.UTF-8:is_IS.ISO8859-1
-SAME+=		ja_JP.UTF-8:ja_JP.SJIS
-SAME+=		ja_JP.UTF-8:ja_JP.eucJP
-SAME+=		ko_KR.UTF-8:ko_KR.eucKR
-SAME+=		lt_LT.UTF-8:lt_LT.ISO8859-13
-SAME+=		lv_LV.UTF-8:lv_LV.ISO8859-13
-SAME+=		nb_NO.UTF-8:nb_NO.ISO8859-15
-SAME+=		nb_NO.UTF-8:nb_NO.ISO8859-1
-SAME+=		pl_PL.UTF-8:pl_PL.ISO8859-2
-SAME+=		ro_RO.UTF-8:ro_RO.ISO8859-2
-SAME+=		se_NO.UTF-8:se_FI.UTF-8
-SAME+=		sk_SK.UTF-8:sk_SK.ISO8859-2
-SAME+=		sl_SI.UTF-8:sl_SI.ISO8859-2
-SAME+=		sv_SE.UTF-8:sv_SE.ISO8859-15
-SAME+=		sv_SE.UTF-8:sv_SE.ISO8859-1
-SAME+=		sv_SE.UTF-8:sv_FI.UTF-8
-SAME+=		sv_SE.UTF-8:sv_FI.ISO8859-15
-SAME+=		sv_SE.UTF-8:sv_FI.ISO8859-1
-SAME+=		tr_TR.UTF-8:tr_TR.ISO8859-9
-SAME+=		uk_UA.UTF-8:uk_UA.KOI8-U
-SAME+=		uk_UA.UTF-8:uk_UA.ISO8859-5
-SAME+=		uk_UA.UTF-8:uk_UA.CP1251
-SAME+=		zh_Hans_CN.UTF-8:zh_Hans_CN.GBK
-SAME+=		zh_Hans_CN.UTF-8:zh_Hans_CN.GB2312
-SAME+=		zh_Hans_CN.UTF-8:zh_Hans_CN.GB18030
-SAME+=		zh_Hans_CN.UTF-8:zh_Hans_CN.eucCN
-SAME+=		zh_Hant_TW.UTF-8:zh_Hant_TW.Big5
-SAME+=		zh_Hant_TW.UTF-8:zh_Hant_HK.UTF-8
-SAME+=		zh_Hant_TW.UTF-8:zh_Hant_HK.Big5HKSCS
-SAME+=		ko_KR.eucKR:ko_KR.CP949	# legacy (same charset)
+SAME+=		af_ZA.UTF-8 af_ZA.ISO8859-15
+SAME+=		af_ZA.UTF-8 af_ZA.ISO8859-1
+SAME+=		ar_SA.UTF-8 ar_QA.UTF-8
+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+=		be_BY.UTF-8 be_BY.ISO8859-5
+SAME+=		be_BY.UTF-8 be_BY.CP1251
+SAME+=		be_BY.UTF-8 be_BY.CP1131
+SAME+=		ru_RU.UTF-8 sr_Cyrl_RS.UTF-8
+SAME+=		ru_RU.UTF-8 sr_Cyrl_RS.ISO8859-5
+SAME+=		ru_RU.UTF-8 ru_RU.KOI8-R
+SAME+=		ru_RU.UTF-8 ru_RU.ISO8859-5
+SAME+=		ru_RU.UTF-8 ru_RU.CP866
+SAME+=		ru_RU.UTF-8 ru_RU.CP1251
+SAME+=		ru_RU.UTF-8 mn_Cyrl_MN.UTF-8
+SAME+=		ru_RU.UTF-8 bg_BG.UTF-8
+SAME+=		ru_RU.UTF-8 bg_BG.CP1251
+SAME+=		ca_AD.UTF-8 ca_IT.UTF-8
+SAME+=		ca_AD.UTF-8 ca_IT.ISO8859-15
+SAME+=		ca_AD.UTF-8 ca_IT.ISO8859-1
+SAME+=		ca_AD.UTF-8 ca_FR.UTF-8
+SAME+=		ca_AD.UTF-8 ca_FR.ISO8859-15
+SAME+=		ca_AD.UTF-8 ca_FR.ISO8859-1
+SAME+=		ca_AD.UTF-8 ca_ES.UTF-8
+SAME+=		ca_AD.UTF-8 ca_ES.ISO8859-15
+SAME+=		ca_AD.UTF-8 ca_ES.ISO8859-1
+SAME+=		ca_AD.UTF-8 ca_AD.ISO8859-15
+SAME+=		ca_AD.UTF-8 ca_AD.ISO8859-1
+SAME+=		cs_CZ.UTF-8 cs_CZ.ISO8859-2
+SAME+=		da_DK.UTF-8 da_DK.ISO8859-15
+SAME+=		da_DK.UTF-8 da_DK.ISO8859-1
+SAME+=		en_US.UTF-8 sr_Latn_RS.UTF-8
+SAME+=		en_US.UTF-8 sr_Latn_RS.ISO8859-2
+SAME+=		en_US.UTF-8 pt_PT.UTF-8
+SAME+=		en_US.UTF-8 pt_PT.ISO8859-15
+SAME+=		en_US.UTF-8 pt_PT.ISO8859-1
+SAME+=		en_US.UTF-8 pt_BR.UTF-8
+SAME+=		en_US.UTF-8 pt_BR.ISO8859-1
+SAME+=		en_US.UTF-8 nn_NO.UTF-8
+SAME+=		en_US.UTF-8 nn_NO.ISO8859-15
+SAME+=		en_US.UTF-8 nn_NO.ISO8859-1
+SAME+=		en_US.UTF-8 nl_NL.UTF-8
+SAME+=		en_US.UTF-8 nl_NL.ISO8859-15
+SAME+=		en_US.UTF-8 nl_NL.ISO8859-1
+SAME+=		en_US.UTF-8 nl_BE.UTF-8
+SAME+=		en_US.UTF-8 nl_BE.ISO8859-15
+SAME+=		en_US.UTF-8 nl_BE.ISO8859-1
+SAME+=		en_US.UTF-8 it_IT.UTF-8
+SAME+=		en_US.UTF-8 it_IT.ISO8859-15
+SAME+=		en_US.UTF-8 it_IT.ISO8859-1
+SAME+=		en_US.UTF-8 it_CH.UTF-8
+SAME+=		en_US.UTF-8 it_CH.ISO8859-15
+SAME+=		en_US.UTF-8 it_CH.ISO8859-1
+SAME+=		en_US.UTF-8 fr_FR.UTF-8
+SAME+=		en_US.UTF-8 fr_FR.ISO8859-15
+SAME+=		en_US.UTF-8 fr_FR.ISO8859-1
+SAME+=		en_US.UTF-8 fr_CH.UTF-8
+SAME+=		en_US.UTF-8 fr_CH.ISO8859-15
+SAME+=		en_US.UTF-8 fr_CH.ISO8859-1
+SAME+=		en_US.UTF-8 fr_CA.UTF-8
+SAME+=		en_US.UTF-8 fr_CA.ISO8859-15
+SAME+=		en_US.UTF-8 fr_CA.ISO8859-1
+SAME+=		en_US.UTF-8 fr_BE.UTF-8
+SAME+=		en_US.UTF-8 fr_BE.ISO8859-15
+SAME+=		en_US.UTF-8 fr_BE.ISO8859-1
+SAME+=		en_US.UTF-8 eu_ES.UTF-8
+SAME+=		en_US.UTF-8 eu_ES.ISO8859-15
+SAME+=		en_US.UTF-8 eu_ES.ISO8859-1
+SAME+=		en_US.UTF-8 en_ZA.UTF-8
+SAME+=		en_US.UTF-8 en_ZA.US-ASCII
+SAME+=		en_US.UTF-8 en_ZA.ISO8859-15
+SAME+=		en_US.UTF-8 en_ZA.ISO8859-1
+SAME+=		en_US.UTF-8 en_US.US-ASCII
+SAME+=		en_US.UTF-8 en_US.ISO8859-15
+SAME+=		en_US.UTF-8 en_US.ISO8859-1
+SAME+=		en_US.UTF-8 en_SG.UTF-8
+SAME+=		en_US.UTF-8 en_SG.ISO8859-1
+SAME+=		en_US.UTF-8 en_PH.UTF-8
+SAME+=		en_US.UTF-8 en_NZ.UTF-8
+SAME+=		en_US.UTF-8 en_NZ.US-ASCII
+SAME+=		en_US.UTF-8 en_NZ.ISO8859-15
+SAME+=		en_US.UTF-8 en_NZ.ISO8859-1
+SAME+=		en_US.UTF-8 en_IE.UTF-8
+SAME+=		en_US.UTF-8 en_IE.ISO8859-15
+SAME+=		en_US.UTF-8 en_IE.ISO8859-1
+SAME+=		en_US.UTF-8 en_HK.UTF-8
+SAME+=		en_US.UTF-8 en_HK.ISO8859-1
+SAME+=		en_US.UTF-8 en_GB.UTF-8
+SAME+=		en_US.UTF-8 en_GB.US-ASCII
+SAME+=		en_US.UTF-8 en_GB.ISO8859-15
+SAME+=		en_US.UTF-8 en_GB.ISO8859-1
+SAME+=		en_US.UTF-8 en_CA.UTF-8
+SAME+=		en_US.UTF-8 en_CA.US-ASCII
+SAME+=		en_US.UTF-8 en_CA.ISO8859-15
+SAME+=		en_US.UTF-8 en_CA.ISO8859-1
+SAME+=		en_US.UTF-8 en_AU.UTF-8
+SAME+=		en_US.UTF-8 en_AU.US-ASCII
+SAME+=		en_US.UTF-8 en_AU.ISO8859-15
+SAME+=		en_US.UTF-8 en_AU.ISO8859-1
+SAME+=		en_US.UTF-8 de_DE.UTF-8
+SAME+=		en_US.UTF-8 de_DE.ISO8859-15
+SAME+=		en_US.UTF-8 de_DE.ISO8859-1
+SAME+=		en_US.UTF-8 de_CH.UTF-8
+SAME+=		en_US.UTF-8 de_CH.ISO8859-15
+SAME+=		en_US.UTF-8 de_CH.ISO8859-1
+SAME+=		en_US.UTF-8 de_AT.UTF-8
+SAME+=		en_US.UTF-8 de_AT.ISO8859-15
+SAME+=		en_US.UTF-8 de_AT.ISO8859-1
+SAME+=		el_GR.UTF-8 el_GR.ISO8859-7
+SAME+=		es_MX.UTF-8 es_MX.ISO8859-1
+SAME+=		es_MX.UTF-8 es_ES.UTF-8
+SAME+=		es_MX.UTF-8 es_ES.ISO8859-15
+SAME+=		es_MX.UTF-8 es_ES.ISO8859-1
+SAME+=		es_MX.UTF-8 es_CR.UTF-8
+SAME+=		es_MX.UTF-8 es_AR.UTF-8
+SAME+=		es_MX.UTF-8 es_AR.ISO8859-1
+SAME+=		et_EE.UTF-8 et_EE.ISO8859-15
+SAME+=		et_EE.UTF-8 et_EE.ISO8859-1
+SAME+=		fi_FI.UTF-8 fi_FI.ISO8859-15
+SAME+=		fi_FI.UTF-8 fi_FI.ISO8859-1
+SAME+=		hi_IN.UTF-8 hi_IN.ISCII-DEV
+SAME+=		hr_HR.UTF-8 hr_HR.ISO8859-2
+SAME+=		hu_HU.UTF-8 hu_HU.ISO8859-2
+SAME+=		hy_AM.UTF-8 hy_AM.ARMSCII-8
+SAME+=		is_IS.UTF-8 is_IS.ISO8859-15
+SAME+=		is_IS.UTF-8 is_IS.ISO8859-1
+SAME+=		ja_JP.UTF-8 ja_JP.SJIS
+SAME+=		ja_JP.UTF-8 ja_JP.eucJP
+SAME+=		ko_KR.UTF-8 ko_KR.eucKR
+SAME+=		lt_LT.UTF-8 lt_LT.ISO8859-13
+SAME+=		lv_LV.UTF-8 lv_LV.ISO8859-13
+SAME+=		nb_NO.UTF-8 nb_NO.ISO8859-15
+SAME+=		nb_NO.UTF-8 nb_NO.ISO8859-1
+SAME+=		pl_PL.UTF-8 pl_PL.ISO8859-2
+SAME+=		ro_RO.UTF-8 ro_RO.ISO8859-2
+SAME+=		se_NO.UTF-8 se_FI.UTF-8
+SAME+=		sk_SK.UTF-8 sk_SK.ISO8859-2
+SAME+=		sl_SI.UTF-8 sl_SI.ISO8859-2
+SAME+=		sv_SE.UTF-8 sv_SE.ISO8859-15
+SAME+=		sv_SE.UTF-8 sv_SE.ISO8859-1
+SAME+=		sv_SE.UTF-8 sv_FI.UTF-8
+SAME+=		sv_SE.UTF-8 sv_FI.ISO8859-15
+SAME+=		sv_SE.UTF-8 sv_FI.ISO8859-1
+SAME+=		tr_TR.UTF-8 tr_TR.ISO8859-9
+SAME+=		uk_UA.UTF-8 uk_UA.KOI8-U
+SAME+=		uk_UA.UTF-8 uk_UA.ISO8859-5
+SAME+=		uk_UA.UTF-8 uk_UA.CP1251
+SAME+=		zh_Hans_CN.UTF-8 zh_Hans_CN.GBK
+SAME+=		zh_Hans_CN.UTF-8 zh_Hans_CN.GB2312
+SAME+=		zh_Hans_CN.UTF-8 zh_Hans_CN.GB18030
+SAME+=		zh_Hans_CN.UTF-8 zh_Hans_CN.eucCN
+SAME+=		zh_Hant_TW.UTF-8 zh_Hant_TW.Big5
+SAME+=		zh_Hant_TW.UTF-8 zh_Hant_HK.UTF-8
+SAME+=		zh_Hant_TW.UTF-8 zh_Hant_HK.Big5HKSCS
+SAME+=		ko_KR.eucKR ko_KR.CP949	# legacy (same charset)
 
 FILES=		${LOCALES:S/$/.LC_COLLATE/}
 CLEANFILES=	${FILES}
 
-.for f in ${SAME}
-SYMLINKS+=	../${f:C/:.*$//}/${FILESNAME} \
-    ${LOCALEDIR}/${f:C/^.*://}/${FILESNAME}
+.for f t in ${SAME}
+SYMLINKS+=	../$f/${FILESNAME} \
+    ${LOCALEDIR}/$t/${FILESNAME}
 .endfor
 
 .for f in ${LOCALES}
diff --git a/share/ctypedef/Makefile b/share/ctypedef/Makefile
index 4a75970..99f7f48 100644
--- a/share/ctypedef/Makefile
+++ b/share/ctypedef/Makefile
@@ -42,202 +42,202 @@ LOCALES+=	zh_Hans_CN.eucCN
 LOCALES+=	zh_Hant_HK.Big5HKSCS
 LOCALES+=	zh_Hant_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: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:sl_SI.UTF-8
-SAME+=		en_US.UTF-8:sk_SK.UTF-8
-SAME+=		en_US.UTF-8:se_NO.UTF-8
-SAME+=		en_US.UTF-8:se_FI.UTF-8
-SAME+=		en_US.UTF-8:ro_RO.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:pl_PL.UTF-8
-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: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:ja_JP.UTF-8
-SAME+=		en_US.UTF-8:it_IT.UTF-8
-SAME+=		en_US.UTF-8:it_CH.UTF-8
-SAME+=		en_US.UTF-8:is_IS.UTF-8
-SAME+=		en_US.UTF-8:hy_AM.UTF-8
-SAME+=		en_US.UTF-8:hu_HU.UTF-8
-SAME+=		en_US.UTF-8:hr_HR.UTF-8
-SAME+=		en_US.UTF-8:hi_IN.UTF-8
-SAME+=		en_US.UTF-8:he_IL.UTF-8
-SAME+=		en_US.UTF-8:fr_FR.UTF-8
-SAME+=		en_US.UTF-8:fr_CH.UTF-8
-SAME+=		en_US.UTF-8:fr_CA.UTF-8
-SAME+=		en_US.UTF-8:fr_BE.UTF-8
-SAME+=		en_US.UTF-8:fi_FI.UTF-8
-SAME+=		en_US.UTF-8:eu_ES.UTF-8
-SAME+=		en_US.UTF-8:et_EE.UTF-8
-SAME+=		en_US.UTF-8:es_MX.UTF-8
-SAME+=		en_US.UTF-8:es_ES.UTF-8
-SAME+=		en_US.UTF-8:es_CR.UTF-8
-SAME+=		en_US.UTF-8:es_AR.UTF-8
-SAME+=		en_US.UTF-8:en_ZA.UTF-8
-SAME+=		en_US.UTF-8:en_SG.UTF-8
-SAME+=		en_US.UTF-8:en_PH.UTF-8
-SAME+=		en_US.UTF-8:en_NZ.UTF-8
-SAME+=		en_US.UTF-8:en_IE.UTF-8
-SAME+=		en_US.UTF-8:en_HK.UTF-8
-SAME+=		en_US.UTF-8:en_GB.UTF-8
-SAME+=		en_US.UTF-8:en_CA.UTF-8
-SAME+=		en_US.UTF-8:en_AU.UTF-8
-SAME+=		en_US.UTF-8:el_GR.UTF-8
-SAME+=		en_US.UTF-8:de_DE.UTF-8
-SAME+=		en_US.UTF-8:de_CH.UTF-8
-SAME+=		en_US.UTF-8:de_AT.UTF-8
-SAME+=		en_US.UTF-8:da_DK.UTF-8
-SAME+=		en_US.UTF-8:cs_CZ.UTF-8
-SAME+=		en_US.UTF-8:ca_IT.UTF-8
-SAME+=		en_US.UTF-8:ca_FR.UTF-8
-SAME+=		en_US.UTF-8:ca_ES.UTF-8
-SAME+=		en_US.UTF-8:ca_AD.UTF-8
-SAME+=		en_US.UTF-8:bg_BG.UTF-8
-SAME+=		en_US.UTF-8:be_BY.UTF-8
-SAME+=		en_US.UTF-8:ar_SA.UTF-8
-SAME+=		en_US.UTF-8:ar_QA.UTF-8
-SAME+=		en_US.UTF-8:ar_MA.UTF-8
-SAME+=		en_US.UTF-8:ar_JO.UTF-8
-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+=		en_US.ISO8859-15:en_GB.ISO8859-15
-SAME+=		en_US.ISO8859-15:sv_SE.ISO8859-15
-SAME+=		en_US.ISO8859-15:sv_FI.ISO8859-15
-SAME+=		en_US.ISO8859-15:pt_PT.ISO8859-15
-SAME+=		en_US.ISO8859-15:nn_NO.ISO8859-15
-SAME+=		en_US.ISO8859-15:nl_NL.ISO8859-15
-SAME+=		en_US.ISO8859-15:nl_BE.ISO8859-15
-SAME+=		en_US.ISO8859-15:nb_NO.ISO8859-15
-SAME+=		en_US.ISO8859-15:it_IT.ISO8859-15
-SAME+=		en_US.ISO8859-15:it_CH.ISO8859-15
-SAME+=		en_US.ISO8859-15:is_IS.ISO8859-15
-SAME+=		en_US.ISO8859-15:fr_FR.ISO8859-15
-SAME+=		en_US.ISO8859-15:fr_CH.ISO8859-15
-SAME+=		en_US.ISO8859-15:fr_CA.ISO8859-15
-SAME+=		en_US.ISO8859-15:fr_BE.ISO8859-15
-SAME+=		en_US.ISO8859-15:fi_FI.ISO8859-15
-SAME+=		en_US.ISO8859-15:eu_ES.ISO8859-15
-SAME+=		en_US.ISO8859-15:et_EE.ISO8859-15
-SAME+=		en_US.ISO8859-15:es_ES.ISO8859-15
-SAME+=		en_US.ISO8859-15:en_ZA.ISO8859-15
-SAME+=		en_US.ISO8859-15:en_NZ.ISO8859-15
-SAME+=		en_US.ISO8859-15:en_IE.ISO8859-15
-SAME+=		en_US.ISO8859-15:en_CA.ISO8859-15
-SAME+=		en_US.ISO8859-15:en_AU.ISO8859-15
-SAME+=		en_US.ISO8859-15:de_DE.ISO8859-15
-SAME+=		en_US.ISO8859-15:de_CH.ISO8859-15
-SAME+=		en_US.ISO8859-15:de_AT.ISO8859-15
-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: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
-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+=		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
-SAME+=		en_US.US-ASCII:en_CA.US-ASCII
-SAME+=		en_US.US-ASCII:en_AU.US-ASCII
-SAME+=		lv_LV.ISO8859-13:lt_LT.ISO8859-13
-SAME+=		ko_KR.eucKR:ko_KR.CP949	# legacy (same charset)
+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 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 sl_SI.UTF-8
+SAME+=		en_US.UTF-8 sk_SK.UTF-8
+SAME+=		en_US.UTF-8 se_NO.UTF-8
+SAME+=		en_US.UTF-8 se_FI.UTF-8
+SAME+=		en_US.UTF-8 ro_RO.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 pl_PL.UTF-8
+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 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 ja_JP.UTF-8
+SAME+=		en_US.UTF-8 it_IT.UTF-8
+SAME+=		en_US.UTF-8 it_CH.UTF-8
+SAME+=		en_US.UTF-8 is_IS.UTF-8
+SAME+=		en_US.UTF-8 hy_AM.UTF-8
+SAME+=		en_US.UTF-8 hu_HU.UTF-8
+SAME+=		en_US.UTF-8 hr_HR.UTF-8
+SAME+=		en_US.UTF-8 hi_IN.UTF-8
+SAME+=		en_US.UTF-8 he_IL.UTF-8
+SAME+=		en_US.UTF-8 fr_FR.UTF-8
+SAME+=		en_US.UTF-8 fr_CH.UTF-8
+SAME+=		en_US.UTF-8 fr_CA.UTF-8
+SAME+=		en_US.UTF-8 fr_BE.UTF-8
+SAME+=		en_US.UTF-8 fi_FI.UTF-8
+SAME+=		en_US.UTF-8 eu_ES.UTF-8
+SAME+=		en_US.UTF-8 et_EE.UTF-8
+SAME+=		en_US.UTF-8 es_MX.UTF-8
+SAME+=		en_US.UTF-8 es_ES.UTF-8
+SAME+=		en_US.UTF-8 es_CR.UTF-8
+SAME+=		en_US.UTF-8 es_AR.UTF-8
+SAME+=		en_US.UTF-8 en_ZA.UTF-8
+SAME+=		en_US.UTF-8 en_SG.UTF-8
+SAME+=		en_US.UTF-8 en_PH.UTF-8
+SAME+=		en_US.UTF-8 en_NZ.UTF-8
+SAME+=		en_US.UTF-8 en_IE.UTF-8
+SAME+=		en_US.UTF-8 en_HK.UTF-8
+SAME+=		en_US.UTF-8 en_GB.UTF-8
+SAME+=		en_US.UTF-8 en_CA.UTF-8
+SAME+=		en_US.UTF-8 en_AU.UTF-8
+SAME+=		en_US.UTF-8 el_GR.UTF-8
+SAME+=		en_US.UTF-8 de_DE.UTF-8
+SAME+=		en_US.UTF-8 de_CH.UTF-8
+SAME+=		en_US.UTF-8 de_AT.UTF-8
+SAME+=		en_US.UTF-8 da_DK.UTF-8
+SAME+=		en_US.UTF-8 cs_CZ.UTF-8
+SAME+=		en_US.UTF-8 ca_IT.UTF-8
+SAME+=		en_US.UTF-8 ca_FR.UTF-8
+SAME+=		en_US.UTF-8 ca_ES.UTF-8
+SAME+=		en_US.UTF-8 ca_AD.UTF-8
+SAME+=		en_US.UTF-8 bg_BG.UTF-8
+SAME+=		en_US.UTF-8 be_BY.UTF-8
+SAME+=		en_US.UTF-8 ar_SA.UTF-8
+SAME+=		en_US.UTF-8 ar_QA.UTF-8
+SAME+=		en_US.UTF-8 ar_MA.UTF-8
+SAME+=		en_US.UTF-8 ar_JO.UTF-8
+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+=		en_US.ISO8859-15 en_GB.ISO8859-15
+SAME+=		en_US.ISO8859-15 sv_SE.ISO8859-15
+SAME+=		en_US.ISO8859-15 sv_FI.ISO8859-15
+SAME+=		en_US.ISO8859-15 pt_PT.ISO8859-15
+SAME+=		en_US.ISO8859-15 nn_NO.ISO8859-15
+SAME+=		en_US.ISO8859-15 nl_NL.ISO8859-15
+SAME+=		en_US.ISO8859-15 nl_BE.ISO8859-15
+SAME+=		en_US.ISO8859-15 nb_NO.ISO8859-15
+SAME+=		en_US.ISO8859-15 it_IT.ISO8859-15
+SAME+=		en_US.ISO8859-15 it_CH.ISO8859-15
+SAME+=		en_US.ISO8859-15 is_IS.ISO8859-15
+SAME+=		en_US.ISO8859-15 fr_FR.ISO8859-15
+SAME+=		en_US.ISO8859-15 fr_CH.ISO8859-15
+SAME+=		en_US.ISO8859-15 fr_CA.ISO8859-15
+SAME+=		en_US.ISO8859-15 fr_BE.ISO8859-15
+SAME+=		en_US.ISO8859-15 fi_FI.ISO8859-15
+SAME+=		en_US.ISO8859-15 eu_ES.ISO8859-15
+SAME+=		en_US.ISO8859-15 et_EE.ISO8859-15
+SAME+=		en_US.ISO8859-15 es_ES.ISO8859-15
+SAME+=		en_US.ISO8859-15 en_ZA.ISO8859-15
+SAME+=		en_US.ISO8859-15 en_NZ.ISO8859-15
+SAME+=		en_US.ISO8859-15 en_IE.ISO8859-15
+SAME+=		en_US.ISO8859-15 en_CA.ISO8859-15
+SAME+=		en_US.ISO8859-15 en_AU.ISO8859-15
+SAME+=		en_US.ISO8859-15 de_DE.ISO8859-15
+SAME+=		en_US.ISO8859-15 de_CH.ISO8859-15
+SAME+=		en_US.ISO8859-15 de_AT.ISO8859-15
+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 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
+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+=		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
+SAME+=		en_US.US-ASCII en_CA.US-ASCII
+SAME+=		en_US.US-ASCII en_AU.US-ASCII
+SAME+=		lv_LV.ISO8859-13 lt_LT.ISO8859-13
+SAME+=		ko_KR.eucKR ko_KR.CP949	# legacy (same charset)
 
 FILES=		${LOCALES:S/$/.LC_CTYPE/}
 CLEANFILES=	${FILES}
 
-.for f in ${SAME}
-SYMLINKS+=	../${f:C/:.*$//}/${FILESNAME} \
-    ${LOCALEDIR}/${f:C/^.*://}/${FILESNAME}
+.for f t in ${SAME}
+SYMLINKS+=	../$f/${FILESNAME} \
+    ${LOCALEDIR}/$t/${FILESNAME}
 .endfor
 
 .for f in ${LOCALES}
 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.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_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:tr_TR.ISO8859-9.src
-SYMPAIRS+=	ja_JP.eucJP.src:ja_JP.SJIS.src
+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.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_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 tr_TR.ISO8859-9.src
+SYMPAIRS+=	ja_JP.eucJP.src ja_JP.SJIS.src
 
-.for PAIR in ${SYMPAIRS}
-${PAIR:C/^.*://:S/src$/LC_CTYPE/}: ${PAIR:C/:.*//}
+.for s t in ${SYMPAIRS}
+${t:S/src$/LC_CTYPE/}: $s
 	localedef -D -U -c -w ${MAPLOC}/widths.txt \
 	-f ${MAPLOC}/map.${.TARGET:T:R:C/^.*\.//} \
 	-i ${.ALLSRC} ${.OBJDIR}/${.TARGET:T:R}  || true
diff --git a/share/monetdef/Makefile b/share/monetdef/Makefile
index 2fb532c..ad0c33c 100644
--- a/share/monetdef/Makefile
+++ b/share/monetdef/Makefile
@@ -109,106 +109,106 @@ LOCALES+=	zh_Hant_HK.UTF-8
 LOCALES+=	zh_Hant_TW.Big5
 LOCALES+=	zh_Hant_TW.UTF-8
 
-SAME+=		en_ZA.ISO8859-15:en_ZA.ISO8859-1
-SAME+=		en_ZA.ISO8859-15:af_ZA.ISO8859-15
-SAME+=		en_ZA.ISO8859-15:af_ZA.ISO8859-1
-SAME+=		en_ZA.UTF-8:af_ZA.UTF-8
-SAME+=		sl_SI.ISO8859-2:nl_BE.ISO8859-1
-SAME+=		sl_SI.ISO8859-2:it_IT.ISO8859-1
-SAME+=		sl_SI.ISO8859-2:fr_BE.ISO8859-1
-SAME+=		sl_SI.ISO8859-2:eu_ES.ISO8859-1
-SAME+=		sl_SI.ISO8859-2:es_ES.ISO8859-1
-SAME+=		sl_SI.ISO8859-2:de_DE.ISO8859-1
-SAME+=		sl_SI.ISO8859-2:ca_IT.ISO8859-1
-SAME+=		sl_SI.ISO8859-2:ca_FR.ISO8859-1
-SAME+=		sl_SI.ISO8859-2:ca_ES.ISO8859-1
-SAME+=		sl_SI.ISO8859-2:ca_AD.ISO8859-1
-SAME+=		nl_BE.ISO8859-15:it_IT.ISO8859-15
-SAME+=		nl_BE.ISO8859-15:fr_BE.ISO8859-15
-SAME+=		nl_BE.ISO8859-15:eu_ES.ISO8859-15
-SAME+=		nl_BE.ISO8859-15:es_ES.ISO8859-15
-SAME+=		nl_BE.ISO8859-15:el_GR.ISO8859-7
-SAME+=		nl_BE.ISO8859-15:de_DE.ISO8859-15
-SAME+=		nl_BE.ISO8859-15:ca_IT.ISO8859-15
-SAME+=		nl_BE.ISO8859-15:ca_FR.ISO8859-15
-SAME+=		nl_BE.ISO8859-15:ca_ES.ISO8859-15
-SAME+=		nl_BE.ISO8859-15:ca_AD.ISO8859-15
-SAME+=		sl_SI.UTF-8:nl_BE.UTF-8
-SAME+=		sl_SI.UTF-8:it_IT.UTF-8
-SAME+=		sl_SI.UTF-8:fr_BE.UTF-8
-SAME+=		sl_SI.UTF-8:eu_ES.UTF-8
-SAME+=		sl_SI.UTF-8:es_ES.UTF-8
-SAME+=		sl_SI.UTF-8:el_GR.UTF-8
-SAME+=		sl_SI.UTF-8:de_DE.UTF-8
-SAME+=		sl_SI.UTF-8:ca_IT.UTF-8
-SAME+=		sl_SI.UTF-8:ca_FR.UTF-8
-SAME+=		sl_SI.UTF-8:ca_ES.UTF-8
-SAME+=		sl_SI.UTF-8:ca_AD.UTF-8
-SAME+=		da_DK.UTF-8:da_DK.ISO8859-15
-SAME+=		da_DK.UTF-8:da_DK.ISO8859-1
-SAME+=		it_CH.UTF-8:it_CH.ISO8859-15
-SAME+=		it_CH.UTF-8:it_CH.ISO8859-1
-SAME+=		it_CH.UTF-8:de_CH.UTF-8
-SAME+=		it_CH.UTF-8:de_CH.ISO8859-15
-SAME+=		it_CH.UTF-8:de_CH.ISO8859-1
-SAME+=		en_AU.UTF-8:en_AU.US-ASCII
-SAME+=		en_AU.UTF-8:en_AU.ISO8859-15
-SAME+=		en_AU.UTF-8:en_AU.ISO8859-1
-SAME+=		en_CA.UTF-8:en_CA.US-ASCII
-SAME+=		en_CA.UTF-8:en_CA.ISO8859-15
-SAME+=		en_CA.UTF-8:en_CA.ISO8859-1
-SAME+=		en_GB.ISO8859-15:en_GB.ISO8859-1
-SAME+=		zh_Hant_HK.UTF-8:zh_Hant_HK.Big5HKSCS
-SAME+=		zh_Hant_HK.UTF-8:en_HK.UTF-8
-SAME+=		zh_Hant_HK.UTF-8:en_HK.ISO8859-1
-SAME+=		en_NZ.UTF-8:en_NZ.US-ASCII
-SAME+=		en_NZ.UTF-8:en_NZ.ISO8859-15
-SAME+=		en_NZ.UTF-8:en_NZ.ISO8859-1
-SAME+=		en_SG.UTF-8:en_SG.ISO8859-1
-SAME+=		en_US.UTF-8:en_US.US-ASCII
-SAME+=		en_US.UTF-8:en_US.ISO8859-15
-SAME+=		en_US.UTF-8:en_US.ISO8859-1
-SAME+=		es_AR.UTF-8:es_AR.ISO8859-1
-SAME+=		es_MX.UTF-8:es_MX.ISO8859-1
-SAME+=		sv_FI.ISO8859-1:sk_SK.ISO8859-2
-SAME+=		sv_FI.ISO8859-1:pt_PT.ISO8859-1
-SAME+=		sv_FI.ISO8859-1:lt_LT.ISO8859-13
-SAME+=		sv_FI.ISO8859-1:fr_FR.ISO8859-1
-SAME+=		sv_FI.ISO8859-1:fi_FI.ISO8859-1
-SAME+=		sv_FI.ISO8859-1:et_EE.ISO8859-1
-SAME+=		sv_FI.ISO8859-15:pt_PT.ISO8859-15
-SAME+=		sv_FI.ISO8859-15:fr_FR.ISO8859-15
-SAME+=		sv_FI.ISO8859-15:fi_FI.ISO8859-15
-SAME+=		sv_FI.ISO8859-15:et_EE.ISO8859-15
-SAME+=		sk_SK.UTF-8:pt_PT.UTF-8
-SAME+=		sk_SK.UTF-8:fr_FR.UTF-8
-SAME+=		sk_SK.UTF-8:et_EE.UTF-8
-SAME+=		sv_FI.UTF-8:se_FI.UTF-8
-SAME+=		sv_FI.UTF-8:lt_LT.UTF-8
-SAME+=		sv_FI.UTF-8:fi_FI.UTF-8
-SAME+=		fr_CA.ISO8859-15:fr_CA.ISO8859-1
-SAME+=		fr_CH.ISO8859-15:fr_CH.ISO8859-1
-SAME+=		hr_HR.UTF-8:hr_HR.ISO8859-2
-SAME+=		is_IS.UTF-8:is_IS.ISO8859-15
-SAME+=		is_IS.UTF-8:is_IS.ISO8859-1
-SAME+=		nb_NO.ISO8859-15:nb_NO.ISO8859-1
-SAME+=		nn_NO.ISO8859-15:nn_NO.ISO8859-1
-SAME+=		se_NO.UTF-8:nn_NO.UTF-8
-SAME+=		pt_BR.UTF-8:pt_BR.ISO8859-1
-SAME+=		ro_RO.UTF-8:ro_RO.ISO8859-2
-SAME+=		sr_Latn_RS.UTF-8:sr_Latn_RS.ISO8859-2
-SAME+=		sr_Latn_RS.UTF-8:sr_Cyrl_RS.UTF-8
-SAME+=		sr_Latn_RS.UTF-8:sr_Cyrl_RS.ISO8859-5
-SAME+=		sv_SE.ISO8859-15:sv_SE.ISO8859-1
-SAME+=		zh_Hans_CN.GBK:zh_Hans_CN.GB18030
-SAME+=		ko_KR.eucKR:ko_KR.CP949	# legacy (same charset)
+SAME+=		en_ZA.ISO8859-15 en_ZA.ISO8859-1
+SAME+=		en_ZA.ISO8859-15 af_ZA.ISO8859-15
+SAME+=		en_ZA.ISO8859-15 af_ZA.ISO8859-1
+SAME+=		en_ZA.UTF-8 af_ZA.UTF-8
+SAME+=		sl_SI.ISO8859-2 nl_BE.ISO8859-1
+SAME+=		sl_SI.ISO8859-2 it_IT.ISO8859-1
+SAME+=		sl_SI.ISO8859-2 fr_BE.ISO8859-1
+SAME+=		sl_SI.ISO8859-2 eu_ES.ISO8859-1
+SAME+=		sl_SI.ISO8859-2 es_ES.ISO8859-1
+SAME+=		sl_SI.ISO8859-2 de_DE.ISO8859-1
+SAME+=		sl_SI.ISO8859-2 ca_IT.ISO8859-1
+SAME+=		sl_SI.ISO8859-2 ca_FR.ISO8859-1
+SAME+=		sl_SI.ISO8859-2 ca_ES.ISO8859-1
+SAME+=		sl_SI.ISO8859-2 ca_AD.ISO8859-1
+SAME+=		nl_BE.ISO8859-15 it_IT.ISO8859-15
+SAME+=		nl_BE.ISO8859-15 fr_BE.ISO8859-15
+SAME+=		nl_BE.ISO8859-15 eu_ES.ISO8859-15
+SAME+=		nl_BE.ISO8859-15 es_ES.ISO8859-15
+SAME+=		nl_BE.ISO8859-15 el_GR.ISO8859-7
+SAME+=		nl_BE.ISO8859-15 de_DE.ISO8859-15
+SAME+=		nl_BE.ISO8859-15 ca_IT.ISO8859-15
+SAME+=		nl_BE.ISO8859-15 ca_FR.ISO8859-15
+SAME+=		nl_BE.ISO8859-15 ca_ES.ISO8859-15
+SAME+=		nl_BE.ISO8859-15 ca_AD.ISO8859-15
+SAME+=		sl_SI.UTF-8 nl_BE.UTF-8
+SAME+=		sl_SI.UTF-8 it_IT.UTF-8
+SAME+=		sl_SI.UTF-8 fr_BE.UTF-8
+SAME+=		sl_SI.UTF-8 eu_ES.UTF-8
+SAME+=		sl_SI.UTF-8 es_ES.UTF-8
+SAME+=		sl_SI.UTF-8 el_GR.UTF-8
+SAME+=		sl_SI.UTF-8 de_DE.UTF-8
+SAME+=		sl_SI.UTF-8 ca_IT.UTF-8
+SAME+=		sl_SI.UTF-8 ca_FR.UTF-8
+SAME+=		sl_SI.UTF-8 ca_ES.UTF-8
+SAME+=		sl_SI.UTF-8 ca_AD.UTF-8
+SAME+=		da_DK.UTF-8 da_DK.ISO8859-15
+SAME+=		da_DK.UTF-8 da_DK.ISO8859-1
+SAME+=		it_CH.UTF-8 it_CH.ISO8859-15
+SAME+=		it_CH.UTF-8 it_CH.ISO8859-1
+SAME+=		it_CH.UTF-8 de_CH.UTF-8
+SAME+=		it_CH.UTF-8 de_CH.ISO8859-15
+SAME+=		it_CH.UTF-8 de_CH.ISO8859-1
+SAME+=		en_AU.UTF-8 en_AU.US-ASCII
+SAME+=		en_AU.UTF-8 en_AU.ISO8859-15
+SAME+=		en_AU.UTF-8 en_AU.ISO8859-1
+SAME+=		en_CA.UTF-8 en_CA.US-ASCII
+SAME+=		en_CA.UTF-8 en_CA.ISO8859-15
+SAME+=		en_CA.UTF-8 en_CA.ISO8859-1
+SAME+=		en_GB.ISO8859-15 en_GB.ISO8859-1
+SAME+=		zh_Hant_HK.UTF-8 zh_Hant_HK.Big5HKSCS
+SAME+=		zh_Hant_HK.UTF-8 en_HK.UTF-8
+SAME+=		zh_Hant_HK.UTF-8 en_HK.ISO8859-1
+SAME+=		en_NZ.UTF-8 en_NZ.US-ASCII
+SAME+=		en_NZ.UTF-8 en_NZ.ISO8859-15
+SAME+=		en_NZ.UTF-8 en_NZ.ISO8859-1
+SAME+=		en_SG.UTF-8 en_SG.ISO8859-1
+SAME+=		en_US.UTF-8 en_US.US-ASCII
+SAME+=		en_US.UTF-8 en_US.ISO8859-15
+SAME+=		en_US.UTF-8 en_US.ISO8859-1
+SAME+=		es_AR.UTF-8 es_AR.ISO8859-1
+SAME+=		es_MX.UTF-8 es_MX.ISO8859-1
+SAME+=		sv_FI.ISO8859-1 sk_SK.ISO8859-2
+SAME+=		sv_FI.ISO8859-1 pt_PT.ISO8859-1
+SAME+=		sv_FI.ISO8859-1 lt_LT.ISO8859-13
+SAME+=		sv_FI.ISO8859-1 fr_FR.ISO8859-1
+SAME+=		sv_FI.ISO8859-1 fi_FI.ISO8859-1
+SAME+=		sv_FI.ISO8859-1 et_EE.ISO8859-1
+SAME+=		sv_FI.ISO8859-15 pt_PT.ISO8859-15
+SAME+=		sv_FI.ISO8859-15 fr_FR.ISO8859-15
+SAME+=		sv_FI.ISO8859-15 fi_FI.ISO8859-15
+SAME+=		sv_FI.ISO8859-15 et_EE.ISO8859-15
+SAME+=		sk_SK.UTF-8 pt_PT.UTF-8
+SAME+=		sk_SK.UTF-8 fr_FR.UTF-8
+SAME+=		sk_SK.UTF-8 et_EE.UTF-8
+SAME+=		sv_FI.UTF-8 se_FI.UTF-8
+SAME+=		sv_FI.UTF-8 lt_LT.UTF-8
+SAME+=		sv_FI.UTF-8 fi_FI.UTF-8
+SAME+=		fr_CA.ISO8859-15 fr_CA.ISO8859-1
+SAME+=		fr_CH.ISO8859-15 fr_CH.ISO8859-1
+SAME+=		hr_HR.UTF-8 hr_HR.ISO8859-2
+SAME+=		is_IS.UTF-8 is_IS.ISO8859-15
+SAME+=		is_IS.UTF-8 is_IS.ISO8859-1
+SAME+=		nb_NO.ISO8859-15 nb_NO.ISO8859-1
+SAME+=		nn_NO.ISO8859-15 nn_NO.ISO8859-1
+SAME+=		se_NO.UTF-8 nn_NO.UTF-8
+SAME+=		pt_BR.UTF-8 pt_BR.ISO8859-1
+SAME+=		ro_RO.UTF-8 ro_RO.ISO8859-2
+SAME+=		sr_Latn_RS.UTF-8 sr_Latn_RS.ISO8859-2
+SAME+=		sr_Latn_RS.UTF-8 sr_Cyrl_RS.UTF-8
+SAME+=		sr_Latn_RS.UTF-8 sr_Cyrl_RS.ISO8859-5
+SAME+=		sv_SE.ISO8859-15 sv_SE.ISO8859-1
+SAME+=		zh_Hans_CN.GBK zh_Hans_CN.GB18030
+SAME+=		ko_KR.eucKR ko_KR.CP949	# legacy (same charset)
 
 FILES=		${LOCALES:S/$/.out/}
 CLEANFILES=	${FILES}
 
-.for f in ${SAME}
-SYMLINKS+=	../${f:C/:.*$//}/${FILESNAME} \
-    ${LOCALEDIR}/${f:C/^.*://}/${FILESNAME}
+.for f t in ${SAME}
+SYMLINKS+=	../$f/${FILESNAME} \
+    ${LOCALEDIR}/$t/${FILESNAME}
 .endfor
 
 .for f in ${LOCALES}
diff --git a/share/msgdef/Makefile b/share/msgdef/Makefile
index d6425da..ab5f223 100644
--- a/share/msgdef/Makefile
+++ b/share/msgdef/Makefile
@@ -83,132 +83,132 @@ LOCALES+=	zh_Hant_HK.UTF-8
 LOCALES+=	zh_Hant_TW.Big5
 LOCALES+=	zh_Hant_TW.UTF-8
 
-SAME+=		nl_NL.UTF-8:nl_NL.ISO8859-15
-SAME+=		nl_NL.UTF-8:nl_NL.ISO8859-1
-SAME+=		nl_NL.UTF-8:nl_BE.UTF-8
-SAME+=		nl_NL.UTF-8:nl_BE.ISO8859-15
-SAME+=		nl_NL.UTF-8:nl_BE.ISO8859-1
-SAME+=		nl_NL.UTF-8:af_ZA.UTF-8
-SAME+=		nl_NL.UTF-8:af_ZA.ISO8859-15
-SAME+=		nl_NL.UTF-8:af_ZA.ISO8859-1
-SAME+=		ar_SA.UTF-8:ar_QA.UTF-8
-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+=		es_MX.ISO8859-1:es_ES.ISO8859-15
-SAME+=		es_MX.ISO8859-1:es_ES.ISO8859-1
-SAME+=		es_MX.ISO8859-1:es_AR.ISO8859-1
-SAME+=		es_MX.ISO8859-1:ca_IT.ISO8859-15
-SAME+=		es_MX.ISO8859-1:ca_IT.ISO8859-1
-SAME+=		es_MX.ISO8859-1:ca_FR.ISO8859-15
-SAME+=		es_MX.ISO8859-1:ca_FR.ISO8859-1
-SAME+=		es_MX.ISO8859-1:ca_ES.ISO8859-15
-SAME+=		es_MX.ISO8859-1:ca_ES.ISO8859-1
-SAME+=		es_MX.ISO8859-1:ca_AD.ISO8859-15
-SAME+=		es_MX.ISO8859-1:ca_AD.ISO8859-1
-SAME+=		es_MX.UTF-8:es_ES.UTF-8
-SAME+=		es_MX.UTF-8:es_CR.UTF-8
-SAME+=		es_MX.UTF-8:es_AR.UTF-8
-SAME+=		es_MX.UTF-8:ca_IT.UTF-8
-SAME+=		es_MX.UTF-8:ca_FR.UTF-8
-SAME+=		es_MX.UTF-8:ca_ES.UTF-8
-SAME+=		es_MX.UTF-8:ca_AD.UTF-8
-SAME+=		cs_CZ.UTF-8:cs_CZ.ISO8859-2
-SAME+=		sv_SE.UTF-8:sv_SE.ISO8859-15
-SAME+=		sv_SE.UTF-8:sv_SE.ISO8859-1
-SAME+=		sv_SE.UTF-8:sv_FI.UTF-8
-SAME+=		sv_SE.UTF-8:sv_FI.ISO8859-15
-SAME+=		sv_SE.UTF-8:sv_FI.ISO8859-1
-SAME+=		sv_SE.UTF-8:da_DK.UTF-8
-SAME+=		sv_SE.UTF-8:da_DK.ISO8859-15
-SAME+=		sv_SE.UTF-8:da_DK.ISO8859-1
-SAME+=		de_DE.UTF-8:de_DE.ISO8859-15
-SAME+=		de_DE.UTF-8:de_DE.ISO8859-1
-SAME+=		de_DE.UTF-8:de_CH.UTF-8
-SAME+=		de_DE.UTF-8:de_CH.ISO8859-15
-SAME+=		de_DE.UTF-8:de_CH.ISO8859-1
-SAME+=		de_DE.UTF-8:de_AT.UTF-8
-SAME+=		de_DE.UTF-8:de_AT.ISO8859-15
-SAME+=		de_DE.UTF-8:de_AT.ISO8859-1
-SAME+=		en_US.UTF-8:en_ZA.UTF-8
-SAME+=		en_US.UTF-8:en_ZA.US-ASCII
-SAME+=		en_US.UTF-8:en_ZA.ISO8859-15
-SAME+=		en_US.UTF-8:en_ZA.ISO8859-1
-SAME+=		en_US.UTF-8:en_US.US-ASCII
-SAME+=		en_US.UTF-8:en_US.ISO8859-15
-SAME+=		en_US.UTF-8:en_US.ISO8859-1
-SAME+=		en_US.UTF-8:en_SG.UTF-8
-SAME+=		en_US.UTF-8:en_SG.ISO8859-1
-SAME+=		en_US.UTF-8:en_PH.UTF-8
-SAME+=		en_US.UTF-8:en_NZ.UTF-8
-SAME+=		en_US.UTF-8:en_NZ.US-ASCII
-SAME+=		en_US.UTF-8:en_NZ.ISO8859-15
-SAME+=		en_US.UTF-8:en_NZ.ISO8859-1
-SAME+=		en_US.UTF-8:en_IE.UTF-8
-SAME+=		en_US.UTF-8:en_IE.ISO8859-15
-SAME+=		en_US.UTF-8:en_IE.ISO8859-1
-SAME+=		en_US.UTF-8:en_HK.UTF-8
-SAME+=		en_US.UTF-8:en_HK.ISO8859-1
-SAME+=		en_US.UTF-8:en_GB.UTF-8
-SAME+=		en_US.UTF-8:en_GB.US-ASCII
-SAME+=		en_US.UTF-8:en_GB.ISO8859-15
-SAME+=		en_US.UTF-8:en_GB.ISO8859-1
-SAME+=		en_US.UTF-8:en_CA.UTF-8
-SAME+=		en_US.UTF-8:en_CA.US-ASCII
-SAME+=		en_US.UTF-8:en_CA.ISO8859-15
-SAME+=		en_US.UTF-8:en_CA.ISO8859-1
-SAME+=		en_US.UTF-8:en_AU.UTF-8
-SAME+=		en_US.UTF-8:en_AU.US-ASCII
-SAME+=		en_US.UTF-8:en_AU.ISO8859-15
-SAME+=		en_US.UTF-8:en_AU.ISO8859-1
-SAME+=		et_EE.UTF-8:et_EE.ISO8859-15
-SAME+=		et_EE.UTF-8:et_EE.ISO8859-1
-SAME+=		eu_ES.UTF-8:eu_ES.ISO8859-15
-SAME+=		eu_ES.UTF-8:eu_ES.ISO8859-1
-SAME+=		fi_FI.ISO8859-15:fi_FI.ISO8859-1
-SAME+=		fr_FR.UTF-8:fr_FR.ISO8859-15
-SAME+=		fr_FR.UTF-8:fr_FR.ISO8859-1
-SAME+=		fr_FR.UTF-8:fr_CH.UTF-8
-SAME+=		fr_FR.UTF-8:fr_CH.ISO8859-15
-SAME+=		fr_FR.UTF-8:fr_CH.ISO8859-1
-SAME+=		fr_FR.UTF-8:fr_CA.UTF-8
-SAME+=		fr_FR.UTF-8:fr_CA.ISO8859-15
-SAME+=		fr_FR.UTF-8:fr_CA.ISO8859-1
-SAME+=		fr_FR.UTF-8:fr_BE.UTF-8
-SAME+=		fr_FR.UTF-8:fr_BE.ISO8859-15
-SAME+=		fr_FR.UTF-8:fr_BE.ISO8859-1
-SAME+=		sl_SI.UTF-8:sl_SI.ISO8859-2
-SAME+=		sl_SI.UTF-8:hr_HR.UTF-8
-SAME+=		sl_SI.UTF-8:hr_HR.ISO8859-2
-SAME+=		hu_HU.UTF-8:hu_HU.ISO8859-2
-SAME+=		is_IS.ISO8859-15:is_IS.ISO8859-1
-SAME+=		it_IT.ISO8859-15:it_IT.ISO8859-1
-SAME+=		it_IT.ISO8859-15:it_CH.ISO8859-15
-SAME+=		it_IT.ISO8859-15:it_CH.ISO8859-1
-SAME+=		it_IT.UTF-8:it_CH.UTF-8
-SAME+=		lt_LT.UTF-8:lt_LT.ISO8859-13
-SAME+=		nb_NO.UTF-8:nb_NO.ISO8859-15
-SAME+=		nb_NO.UTF-8:nb_NO.ISO8859-1
-SAME+=		nn_NO.UTF-8:nn_NO.ISO8859-15
-SAME+=		nn_NO.UTF-8:nn_NO.ISO8859-1
-SAME+=		pl_PL.UTF-8:pl_PL.ISO8859-2
-SAME+=		pt_PT.ISO8859-15:pt_PT.ISO8859-1
-SAME+=		pt_PT.ISO8859-15:pt_BR.ISO8859-1
-SAME+=		pt_PT.UTF-8:pt_BR.UTF-8
-SAME+=		ro_RO.UTF-8:ro_RO.ISO8859-2
-SAME+=		se_NO.UTF-8:se_FI.UTF-8
-SAME+=		sr_Latn_RS.UTF-8:sr_Cyrl_RS.UTF-8
-SAME+=		zh_Hans_CN.GBK:zh_Hans_CN.GB18030
-SAME+=		zh_Hans_CN.GBK:zh_Hans_CN.eucCN
-SAME+=		ko_KR.eucKR:ko_KR.CP949	# legacy (same charset)
+SAME+=		nl_NL.UTF-8 nl_NL.ISO8859-15
+SAME+=		nl_NL.UTF-8 nl_NL.ISO8859-1
+SAME+=		nl_NL.UTF-8 nl_BE.UTF-8
+SAME+=		nl_NL.UTF-8 nl_BE.ISO8859-15
+SAME+=		nl_NL.UTF-8 nl_BE.ISO8859-1
+SAME+=		nl_NL.UTF-8 af_ZA.UTF-8
+SAME+=		nl_NL.UTF-8 af_ZA.ISO8859-15
+SAME+=		nl_NL.UTF-8 af_ZA.ISO8859-1
+SAME+=		ar_SA.UTF-8 ar_QA.UTF-8
+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+=		es_MX.ISO8859-1 es_ES.ISO8859-15
+SAME+=		es_MX.ISO8859-1 es_ES.ISO8859-1
+SAME+=		es_MX.ISO8859-1 es_AR.ISO8859-1
+SAME+=		es_MX.ISO8859-1 ca_IT.ISO8859-15
+SAME+=		es_MX.ISO8859-1 ca_IT.ISO8859-1
+SAME+=		es_MX.ISO8859-1 ca_FR.ISO8859-15
+SAME+=		es_MX.ISO8859-1 ca_FR.ISO8859-1
+SAME+=		es_MX.ISO8859-1 ca_ES.ISO8859-15
+SAME+=		es_MX.ISO8859-1 ca_ES.ISO8859-1
+SAME+=		es_MX.ISO8859-1 ca_AD.ISO8859-15
+SAME+=		es_MX.ISO8859-1 ca_AD.ISO8859-1
+SAME+=		es_MX.UTF-8 es_ES.UTF-8
+SAME+=		es_MX.UTF-8 es_CR.UTF-8
+SAME+=		es_MX.UTF-8 es_AR.UTF-8
+SAME+=		es_MX.UTF-8 ca_IT.UTF-8
+SAME+=		es_MX.UTF-8 ca_FR.UTF-8
+SAME+=		es_MX.UTF-8 ca_ES.UTF-8
+SAME+=		es_MX.UTF-8 ca_AD.UTF-8
+SAME+=		cs_CZ.UTF-8 cs_CZ.ISO8859-2
+SAME+=		sv_SE.UTF-8 sv_SE.ISO8859-15
+SAME+=		sv_SE.UTF-8 sv_SE.ISO8859-1
+SAME+=		sv_SE.UTF-8 sv_FI.UTF-8
+SAME+=		sv_SE.UTF-8 sv_FI.ISO8859-15
+SAME+=		sv_SE.UTF-8 sv_FI.ISO8859-1
+SAME+=		sv_SE.UTF-8 da_DK.UTF-8
+SAME+=		sv_SE.UTF-8 da_DK.ISO8859-15
+SAME+=		sv_SE.UTF-8 da_DK.ISO8859-1
+SAME+=		de_DE.UTF-8 de_DE.ISO8859-15
+SAME+=		de_DE.UTF-8 de_DE.ISO8859-1
+SAME+=		de_DE.UTF-8 de_CH.UTF-8
+SAME+=		de_DE.UTF-8 de_CH.ISO8859-15
+SAME+=		de_DE.UTF-8 de_CH.ISO8859-1
+SAME+=		de_DE.UTF-8 de_AT.UTF-8
+SAME+=		de_DE.UTF-8 de_AT.ISO8859-15
+SAME+=		de_DE.UTF-8 de_AT.ISO8859-1
+SAME+=		en_US.UTF-8 en_ZA.UTF-8
+SAME+=		en_US.UTF-8 en_ZA.US-ASCII
+SAME+=		en_US.UTF-8 en_ZA.ISO8859-15
+SAME+=		en_US.UTF-8 en_ZA.ISO8859-1
+SAME+=		en_US.UTF-8 en_US.US-ASCII
+SAME+=		en_US.UTF-8 en_US.ISO8859-15
+SAME+=		en_US.UTF-8 en_US.ISO8859-1
+SAME+=		en_US.UTF-8 en_SG.UTF-8
+SAME+=		en_US.UTF-8 en_SG.ISO8859-1
+SAME+=		en_US.UTF-8 en_PH.UTF-8
+SAME+=		en_US.UTF-8 en_NZ.UTF-8
+SAME+=		en_US.UTF-8 en_NZ.US-ASCII
+SAME+=		en_US.UTF-8 en_NZ.ISO8859-15
+SAME+=		en_US.UTF-8 en_NZ.ISO8859-1
+SAME+=		en_US.UTF-8 en_IE.UTF-8
+SAME+=		en_US.UTF-8 en_IE.ISO8859-15
+SAME+=		en_US.UTF-8 en_IE.ISO8859-1
+SAME+=		en_US.UTF-8 en_HK.UTF-8
+SAME+=		en_US.UTF-8 en_HK.ISO8859-1
+SAME+=		en_US.UTF-8 en_GB.UTF-8
+SAME+=		en_US.UTF-8 en_GB.US-ASCII
+SAME+=		en_US.UTF-8 en_GB.ISO8859-15
+SAME+=		en_US.UTF-8 en_GB.ISO8859-1
+SAME+=		en_US.UTF-8 en_CA.UTF-8
+SAME+=		en_US.UTF-8 en_CA.US-ASCII
+SAME+=		en_US.UTF-8 en_CA.ISO8859-15
+SAME+=		en_US.UTF-8 en_CA.ISO8859-1
+SAME+=		en_US.UTF-8 en_AU.UTF-8
+SAME+=		en_US.UTF-8 en_AU.US-ASCII
+SAME+=		en_US.UTF-8 en_AU.ISO8859-15
+SAME+=		en_US.UTF-8 en_AU.ISO8859-1
+SAME+=		et_EE.UTF-8 et_EE.ISO8859-15
+SAME+=		et_EE.UTF-8 et_EE.ISO8859-1
+SAME+=		eu_ES.UTF-8 eu_ES.ISO8859-15
+SAME+=		eu_ES.UTF-8 eu_ES.ISO8859-1
+SAME+=		fi_FI.ISO8859-15 fi_FI.ISO8859-1
+SAME+=		fr_FR.UTF-8 fr_FR.ISO8859-15
+SAME+=		fr_FR.UTF-8 fr_FR.ISO8859-1
+SAME+=		fr_FR.UTF-8 fr_CH.UTF-8
+SAME+=		fr_FR.UTF-8 fr_CH.ISO8859-15
+SAME+=		fr_FR.UTF-8 fr_CH.ISO8859-1
+SAME+=		fr_FR.UTF-8 fr_CA.UTF-8
+SAME+=		fr_FR.UTF-8 fr_CA.ISO8859-15
+SAME+=		fr_FR.UTF-8 fr_CA.ISO8859-1
+SAME+=		fr_FR.UTF-8 fr_BE.UTF-8
+SAME+=		fr_FR.UTF-8 fr_BE.ISO8859-15
+SAME+=		fr_FR.UTF-8 fr_BE.ISO8859-1
+SAME+=		sl_SI.UTF-8 sl_SI.ISO8859-2
+SAME+=		sl_SI.UTF-8 hr_HR.UTF-8
+SAME+=		sl_SI.UTF-8 hr_HR.ISO8859-2
+SAME+=		hu_HU.UTF-8 hu_HU.ISO8859-2
+SAME+=		is_IS.ISO8859-15 is_IS.ISO8859-1
+SAME+=		it_IT.ISO8859-15 it_IT.ISO8859-1
+SAME+=		it_IT.ISO8859-15 it_CH.ISO8859-15
+SAME+=		it_IT.ISO8859-15 it_CH.ISO8859-1
+SAME+=		it_IT.UTF-8 it_CH.UTF-8
+SAME+=		lt_LT.UTF-8 lt_LT.ISO8859-13
+SAME+=		nb_NO.UTF-8 nb_NO.ISO8859-15
+SAME+=		nb_NO.UTF-8 nb_NO.ISO8859-1
+SAME+=		nn_NO.UTF-8 nn_NO.ISO8859-15
+SAME+=		nn_NO.UTF-8 nn_NO.ISO8859-1
+SAME+=		pl_PL.UTF-8 pl_PL.ISO8859-2
+SAME+=		pt_PT.ISO8859-15 pt_PT.ISO8859-1
+SAME+=		pt_PT.ISO8859-15 pt_BR.ISO8859-1
+SAME+=		pt_PT.UTF-8 pt_BR.UTF-8
+SAME+=		ro_RO.UTF-8 ro_RO.ISO8859-2
+SAME+=		se_NO.UTF-8 se_FI.UTF-8
+SAME+=		sr_Latn_RS.UTF-8 sr_Cyrl_RS.UTF-8
+SAME+=		zh_Hans_CN.GBK zh_Hans_CN.GB18030
+SAME+=		zh_Hans_CN.GBK zh_Hans_CN.eucCN
+SAME+=		ko_KR.eucKR ko_KR.CP949	# legacy (same charset)
 
 FILES=		${LOCALES:S/$/.out/}
 CLEANFILES=	${FILES}
 
-.for f in ${SAME}
-SYMLINKS+=	../${f:C/:.*$//}/${FILESNAME} \
-    ${LOCALEDIR}/${f:C/^.*://}/${FILESNAME}
+.for f t in ${SAME}
+SYMLINKS+=	../$f/${FILESNAME} \
+    ${LOCALEDIR}/$t/${FILESNAME}
 .endfor
 
 .for f in ${LOCALES}
diff --git a/share/numericdef/Makefile b/share/numericdef/Makefile
index 2220216..20b7980 100644
--- a/share/numericdef/Makefile
+++ b/share/numericdef/Makefile
@@ -27,188 +27,188 @@ LOCALES+=	zh_Hans_CN.GB2312
 LOCALES+=	zh_Hans_CN.eucCN
 LOCALES+=	zh_Hant_TW.Big5
 
-SAME+=		uk_UA.ISO8859-5:uk_UA.CP1251
-SAME+=		uk_UA.ISO8859-5:sv_SE.ISO8859-15
-SAME+=		uk_UA.ISO8859-5:sv_SE.ISO8859-1
-SAME+=		uk_UA.ISO8859-5:sv_FI.ISO8859-15
-SAME+=		uk_UA.ISO8859-5:sv_FI.ISO8859-1
-SAME+=		uk_UA.ISO8859-5:sk_SK.ISO8859-2
-SAME+=		uk_UA.ISO8859-5:ru_RU.ISO8859-5
-SAME+=		uk_UA.ISO8859-5:ru_RU.CP1251
-SAME+=		uk_UA.ISO8859-5:pt_PT.ISO8859-15
-SAME+=		uk_UA.ISO8859-5:pt_PT.ISO8859-1
-SAME+=		uk_UA.ISO8859-5:pl_PL.ISO8859-2
-SAME+=		uk_UA.ISO8859-5:nn_NO.ISO8859-15
-SAME+=		uk_UA.ISO8859-5:nn_NO.ISO8859-1
-SAME+=		uk_UA.ISO8859-5:nb_NO.ISO8859-15
-SAME+=		uk_UA.ISO8859-5:nb_NO.ISO8859-1
-SAME+=		uk_UA.ISO8859-5:lv_LV.ISO8859-13
-SAME+=		uk_UA.ISO8859-5:lt_LT.ISO8859-13
-SAME+=		uk_UA.ISO8859-5:hu_HU.ISO8859-2
-SAME+=		uk_UA.ISO8859-5:fr_FR.ISO8859-15
-SAME+=		uk_UA.ISO8859-5:fr_FR.ISO8859-1
-SAME+=		uk_UA.ISO8859-5:fr_CA.ISO8859-15
-SAME+=		uk_UA.ISO8859-5:fr_CA.ISO8859-1
-SAME+=		uk_UA.ISO8859-5:fi_FI.ISO8859-15
-SAME+=		uk_UA.ISO8859-5:fi_FI.ISO8859-1
-SAME+=		uk_UA.ISO8859-5:et_EE.ISO8859-15
-SAME+=		uk_UA.ISO8859-5:et_EE.ISO8859-1
-SAME+=		uk_UA.ISO8859-5:en_ZA.ISO8859-15
-SAME+=		uk_UA.ISO8859-5:en_ZA.ISO8859-1
-SAME+=		uk_UA.ISO8859-5:cs_CZ.ISO8859-2
-SAME+=		uk_UA.ISO8859-5:bg_BG.CP1251
-SAME+=		uk_UA.ISO8859-5:be_BY.ISO8859-5
-SAME+=		uk_UA.ISO8859-5:be_BY.CP1251
-SAME+=		uk_UA.ISO8859-5:af_ZA.ISO8859-15
-SAME+=		uk_UA.ISO8859-5:af_ZA.ISO8859-1
-SAME+=		uk_UA.UTF-8:sv_SE.UTF-8
-SAME+=		uk_UA.UTF-8:sv_FI.UTF-8
-SAME+=		uk_UA.UTF-8:sk_SK.UTF-8
-SAME+=		uk_UA.UTF-8:se_NO.UTF-8
-SAME+=		uk_UA.UTF-8:se_FI.UTF-8
-SAME+=		uk_UA.UTF-8:ru_RU.UTF-8
-SAME+=		uk_UA.UTF-8:pt_PT.UTF-8
-SAME+=		uk_UA.UTF-8:pl_PL.UTF-8
-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:hu_HU.UTF-8
-SAME+=		uk_UA.UTF-8:fr_FR.UTF-8
-SAME+=		uk_UA.UTF-8:fr_CA.UTF-8
-SAME+=		uk_UA.UTF-8:fi_FI.UTF-8
-SAME+=		uk_UA.UTF-8:et_EE.UTF-8
-SAME+=		uk_UA.UTF-8:en_ZA.UTF-8
-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_Hant_HK.Big5HKSCS
-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:ko_KR.UTF-8
-SAME+=		en_US.UTF-8:ko_KR.eucKR
-SAME+=		en_US.UTF-8:ja_JP.UTF-8
-SAME+=		en_US.UTF-8:ja_JP.SJIS
-SAME+=		en_US.UTF-8:ja_JP.eucJP
-SAME+=		en_US.UTF-8:he_IL.UTF-8
-SAME+=		en_US.UTF-8:es_MX.UTF-8
-SAME+=		en_US.UTF-8:es_MX.ISO8859-1
-SAME+=		en_US.UTF-8:en_US.US-ASCII
-SAME+=		en_US.UTF-8:en_US.ISO8859-15
-SAME+=		en_US.UTF-8:en_US.ISO8859-1
-SAME+=		en_US.UTF-8:en_SG.UTF-8
-SAME+=		en_US.UTF-8:en_SG.ISO8859-1
-SAME+=		en_US.UTF-8:en_PH.UTF-8
-SAME+=		en_US.UTF-8:en_NZ.UTF-8
-SAME+=		en_US.UTF-8:en_NZ.US-ASCII
-SAME+=		en_US.UTF-8:en_NZ.ISO8859-15
-SAME+=		en_US.UTF-8:en_NZ.ISO8859-1
-SAME+=		en_US.UTF-8:en_IE.UTF-8
-SAME+=		en_US.UTF-8:en_IE.ISO8859-15
-SAME+=		en_US.UTF-8:en_IE.ISO8859-1
-SAME+=		en_US.UTF-8:en_HK.UTF-8
-SAME+=		en_US.UTF-8:en_HK.ISO8859-1
-SAME+=		en_US.UTF-8:en_GB.UTF-8
-SAME+=		en_US.UTF-8:en_GB.US-ASCII
-SAME+=		en_US.UTF-8:en_GB.ISO8859-15
-SAME+=		en_US.UTF-8:en_GB.ISO8859-1
-SAME+=		en_US.UTF-8:en_CA.UTF-8
-SAME+=		en_US.UTF-8:en_CA.US-ASCII
-SAME+=		en_US.UTF-8:en_CA.ISO8859-15
-SAME+=		en_US.UTF-8:en_CA.ISO8859-1
-SAME+=		en_US.UTF-8:en_AU.UTF-8
-SAME+=		en_US.UTF-8:en_AU.US-ASCII
-SAME+=		en_US.UTF-8:en_AU.ISO8859-15
-SAME+=		en_US.UTF-8:en_AU.ISO8859-1
-SAME+=		en_US.UTF-8:am_ET.UTF-8
-SAME+=		ar_SA.UTF-8:ar_QA.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+=		tr_TR.UTF-8:tr_TR.ISO8859-9
-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
-SAME+=		tr_TR.UTF-8:ro_RO.ISO8859-2
-SAME+=		tr_TR.UTF-8:pt_BR.UTF-8
-SAME+=		tr_TR.UTF-8:pt_BR.ISO8859-1
-SAME+=		tr_TR.UTF-8:nl_NL.UTF-8
-SAME+=		tr_TR.UTF-8:nl_NL.ISO8859-15
-SAME+=		tr_TR.UTF-8:nl_NL.ISO8859-1
-SAME+=		tr_TR.UTF-8:nl_BE.UTF-8
-SAME+=		tr_TR.UTF-8:nl_BE.ISO8859-15
-SAME+=		tr_TR.UTF-8:nl_BE.ISO8859-1
-SAME+=		tr_TR.UTF-8:it_IT.UTF-8
-SAME+=		tr_TR.UTF-8:it_IT.ISO8859-15
-SAME+=		tr_TR.UTF-8:it_IT.ISO8859-1
-SAME+=		tr_TR.UTF-8:is_IS.UTF-8
-SAME+=		tr_TR.UTF-8:is_IS.ISO8859-15
-SAME+=		tr_TR.UTF-8:is_IS.ISO8859-1
-SAME+=		tr_TR.UTF-8:hr_HR.UTF-8
-SAME+=		tr_TR.UTF-8:hr_HR.ISO8859-2
-SAME+=		tr_TR.UTF-8:fr_BE.UTF-8
-SAME+=		tr_TR.UTF-8:fr_BE.ISO8859-15
-SAME+=		tr_TR.UTF-8:fr_BE.ISO8859-1
-SAME+=		tr_TR.UTF-8:eu_ES.UTF-8
-SAME+=		tr_TR.UTF-8:eu_ES.ISO8859-15
-SAME+=		tr_TR.UTF-8:eu_ES.ISO8859-1
-SAME+=		tr_TR.UTF-8:es_ES.UTF-8
-SAME+=		tr_TR.UTF-8:es_ES.ISO8859-15
-SAME+=		tr_TR.UTF-8:es_ES.ISO8859-1
-SAME+=		tr_TR.UTF-8:es_CR.UTF-8
-SAME+=		tr_TR.UTF-8:es_AR.UTF-8
-SAME+=		tr_TR.UTF-8:es_AR.ISO8859-1
-SAME+=		tr_TR.UTF-8:el_GR.UTF-8
-SAME+=		tr_TR.UTF-8:el_GR.ISO8859-7
-SAME+=		tr_TR.UTF-8:de_DE.UTF-8
-SAME+=		tr_TR.UTF-8:de_DE.ISO8859-15
-SAME+=		tr_TR.UTF-8:de_DE.ISO8859-1
-SAME+=		tr_TR.UTF-8:de_AT.UTF-8
-SAME+=		tr_TR.UTF-8:de_AT.ISO8859-15
-SAME+=		tr_TR.UTF-8:de_AT.ISO8859-1
-SAME+=		tr_TR.UTF-8:da_DK.UTF-8
-SAME+=		tr_TR.UTF-8:da_DK.ISO8859-15
-SAME+=		tr_TR.UTF-8:da_DK.ISO8859-1
-SAME+=		tr_TR.UTF-8:ca_IT.UTF-8
-SAME+=		tr_TR.UTF-8:ca_IT.ISO8859-15
-SAME+=		tr_TR.UTF-8:ca_IT.ISO8859-1
-SAME+=		tr_TR.UTF-8:ca_FR.UTF-8
-SAME+=		tr_TR.UTF-8:ca_FR.ISO8859-15
-SAME+=		tr_TR.UTF-8:ca_FR.ISO8859-1
-SAME+=		tr_TR.UTF-8:ca_ES.UTF-8
-SAME+=		tr_TR.UTF-8:ca_ES.ISO8859-15
-SAME+=		tr_TR.UTF-8:ca_ES.ISO8859-1
-SAME+=		tr_TR.UTF-8:ca_AD.UTF-8
-SAME+=		tr_TR.UTF-8:ca_AD.ISO8859-15
-SAME+=		tr_TR.UTF-8:ca_AD.ISO8859-1
-SAME+=		tr_TR.UTF-8:ar_MA.UTF-8
-SAME+=		ru_RU.CP866:be_BY.CP1131
-SAME+=		it_CH.UTF-8:it_CH.ISO8859-15
-SAME+=		it_CH.UTF-8:it_CH.ISO8859-1
-SAME+=		it_CH.UTF-8:de_CH.UTF-8
-SAME+=		it_CH.UTF-8:de_CH.ISO8859-15
-SAME+=		it_CH.UTF-8:de_CH.ISO8859-1
-SAME+=		fr_CH.ISO8859-15:fr_CH.ISO8859-1
-SAME+=		hi_IN.UTF-8:hi_IN.ISCII-DEV
-SAME+=		hy_AM.UTF-8:hy_AM.ARMSCII-8
-SAME+=		uk_UA.KOI8-U:ru_RU.KOI8-R
-SAME+=		sr_Latn_RS.UTF-8:sr_Latn_RS.ISO8859-2
-SAME+=		sr_Latn_RS.UTF-8:sr_Cyrl_RS.UTF-8
-SAME+=		sr_Latn_RS.UTF-8:sr_Cyrl_RS.ISO8859-5
-SAME+=		ko_KR.eucKR:ko_KR.CP949	# legacy (same charset)
+SAME+=		uk_UA.ISO8859-5 uk_UA.CP1251
+SAME+=		uk_UA.ISO8859-5 sv_SE.ISO8859-15
+SAME+=		uk_UA.ISO8859-5 sv_SE.ISO8859-1
+SAME+=		uk_UA.ISO8859-5 sv_FI.ISO8859-15
+SAME+=		uk_UA.ISO8859-5 sv_FI.ISO8859-1
+SAME+=		uk_UA.ISO8859-5 sk_SK.ISO8859-2
+SAME+=		uk_UA.ISO8859-5 ru_RU.ISO8859-5
+SAME+=		uk_UA.ISO8859-5 ru_RU.CP1251
+SAME+=		uk_UA.ISO8859-5 pt_PT.ISO8859-15
+SAME+=		uk_UA.ISO8859-5 pt_PT.ISO8859-1
+SAME+=		uk_UA.ISO8859-5 pl_PL.ISO8859-2
+SAME+=		uk_UA.ISO8859-5 nn_NO.ISO8859-15
+SAME+=		uk_UA.ISO8859-5 nn_NO.ISO8859-1
+SAME+=		uk_UA.ISO8859-5 nb_NO.ISO8859-15
+SAME+=		uk_UA.ISO8859-5 nb_NO.ISO8859-1
+SAME+=		uk_UA.ISO8859-5 lv_LV.ISO8859-13
+SAME+=		uk_UA.ISO8859-5 lt_LT.ISO8859-13
+SAME+=		uk_UA.ISO8859-5 hu_HU.ISO8859-2
+SAME+=		uk_UA.ISO8859-5 fr_FR.ISO8859-15
+SAME+=		uk_UA.ISO8859-5 fr_FR.ISO8859-1
+SAME+=		uk_UA.ISO8859-5 fr_CA.ISO8859-15
+SAME+=		uk_UA.ISO8859-5 fr_CA.ISO8859-1
+SAME+=		uk_UA.ISO8859-5 fi_FI.ISO8859-15
+SAME+=		uk_UA.ISO8859-5 fi_FI.ISO8859-1
+SAME+=		uk_UA.ISO8859-5 et_EE.ISO8859-15
+SAME+=		uk_UA.ISO8859-5 et_EE.ISO8859-1
+SAME+=		uk_UA.ISO8859-5 en_ZA.ISO8859-15
+SAME+=		uk_UA.ISO8859-5 en_ZA.ISO8859-1
+SAME+=		uk_UA.ISO8859-5 cs_CZ.ISO8859-2
+SAME+=		uk_UA.ISO8859-5 bg_BG.CP1251
+SAME+=		uk_UA.ISO8859-5 be_BY.ISO8859-5
+SAME+=		uk_UA.ISO8859-5 be_BY.CP1251
+SAME+=		uk_UA.ISO8859-5 af_ZA.ISO8859-15
+SAME+=		uk_UA.ISO8859-5 af_ZA.ISO8859-1
+SAME+=		uk_UA.UTF-8 sv_SE.UTF-8
+SAME+=		uk_UA.UTF-8 sv_FI.UTF-8
+SAME+=		uk_UA.UTF-8 sk_SK.UTF-8
+SAME+=		uk_UA.UTF-8 se_NO.UTF-8
+SAME+=		uk_UA.UTF-8 se_FI.UTF-8
+SAME+=		uk_UA.UTF-8 ru_RU.UTF-8
+SAME+=		uk_UA.UTF-8 pt_PT.UTF-8
+SAME+=		uk_UA.UTF-8 pl_PL.UTF-8
+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 hu_HU.UTF-8
+SAME+=		uk_UA.UTF-8 fr_FR.UTF-8
+SAME+=		uk_UA.UTF-8 fr_CA.UTF-8
+SAME+=		uk_UA.UTF-8 fi_FI.UTF-8
+SAME+=		uk_UA.UTF-8 et_EE.UTF-8
+SAME+=		uk_UA.UTF-8 en_ZA.UTF-8
+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_Hant_HK.Big5HKSCS
+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 ko_KR.UTF-8
+SAME+=		en_US.UTF-8 ko_KR.eucKR
+SAME+=		en_US.UTF-8 ja_JP.UTF-8
+SAME+=		en_US.UTF-8 ja_JP.SJIS
+SAME+=		en_US.UTF-8 ja_JP.eucJP
+SAME+=		en_US.UTF-8 he_IL.UTF-8
+SAME+=		en_US.UTF-8 es_MX.UTF-8
+SAME+=		en_US.UTF-8 es_MX.ISO8859-1
+SAME+=		en_US.UTF-8 en_US.US-ASCII
+SAME+=		en_US.UTF-8 en_US.ISO8859-15
+SAME+=		en_US.UTF-8 en_US.ISO8859-1
+SAME+=		en_US.UTF-8 en_SG.UTF-8
+SAME+=		en_US.UTF-8 en_SG.ISO8859-1
+SAME+=		en_US.UTF-8 en_PH.UTF-8
+SAME+=		en_US.UTF-8 en_NZ.UTF-8
+SAME+=		en_US.UTF-8 en_NZ.US-ASCII
+SAME+=		en_US.UTF-8 en_NZ.ISO8859-15
+SAME+=		en_US.UTF-8 en_NZ.ISO8859-1
+SAME+=		en_US.UTF-8 en_IE.UTF-8
+SAME+=		en_US.UTF-8 en_IE.ISO8859-15
+SAME+=		en_US.UTF-8 en_IE.ISO8859-1
+SAME+=		en_US.UTF-8 en_HK.UTF-8
+SAME+=		en_US.UTF-8 en_HK.ISO8859-1
+SAME+=		en_US.UTF-8 en_GB.UTF-8
+SAME+=		en_US.UTF-8 en_GB.US-ASCII
+SAME+=		en_US.UTF-8 en_GB.ISO8859-15
+SAME+=		en_US.UTF-8 en_GB.ISO8859-1
+SAME+=		en_US.UTF-8 en_CA.UTF-8
+SAME+=		en_US.UTF-8 en_CA.US-ASCII
+SAME+=		en_US.UTF-8 en_CA.ISO8859-15
+SAME+=		en_US.UTF-8 en_CA.ISO8859-1
+SAME+=		en_US.UTF-8 en_AU.UTF-8
+SAME+=		en_US.UTF-8 en_AU.US-ASCII
+SAME+=		en_US.UTF-8 en_AU.ISO8859-15
+SAME+=		en_US.UTF-8 en_AU.ISO8859-1
+SAME+=		en_US.UTF-8 am_ET.UTF-8
+SAME+=		ar_SA.UTF-8 ar_QA.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+=		tr_TR.UTF-8 tr_TR.ISO8859-9
+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
+SAME+=		tr_TR.UTF-8 ro_RO.ISO8859-2
+SAME+=		tr_TR.UTF-8 pt_BR.UTF-8
+SAME+=		tr_TR.UTF-8 pt_BR.ISO8859-1
+SAME+=		tr_TR.UTF-8 nl_NL.UTF-8
+SAME+=		tr_TR.UTF-8 nl_NL.ISO8859-15
+SAME+=		tr_TR.UTF-8 nl_NL.ISO8859-1
+SAME+=		tr_TR.UTF-8 nl_BE.UTF-8
+SAME+=		tr_TR.UTF-8 nl_BE.ISO8859-15
+SAME+=		tr_TR.UTF-8 nl_BE.ISO8859-1
+SAME+=		tr_TR.UTF-8 it_IT.UTF-8
+SAME+=		tr_TR.UTF-8 it_IT.ISO8859-15
+SAME+=		tr_TR.UTF-8 it_IT.ISO8859-1
+SAME+=		tr_TR.UTF-8 is_IS.UTF-8
+SAME+=		tr_TR.UTF-8 is_IS.ISO8859-15
+SAME+=		tr_TR.UTF-8 is_IS.ISO8859-1
+SAME+=		tr_TR.UTF-8 hr_HR.UTF-8
+SAME+=		tr_TR.UTF-8 hr_HR.ISO8859-2
+SAME+=		tr_TR.UTF-8 fr_BE.UTF-8
+SAME+=		tr_TR.UTF-8 fr_BE.ISO8859-15
+SAME+=		tr_TR.UTF-8 fr_BE.ISO8859-1
+SAME+=		tr_TR.UTF-8 eu_ES.UTF-8
+SAME+=		tr_TR.UTF-8 eu_ES.ISO8859-15
+SAME+=		tr_TR.UTF-8 eu_ES.ISO8859-1
+SAME+=		tr_TR.UTF-8 es_ES.UTF-8
+SAME+=		tr_TR.UTF-8 es_ES.ISO8859-15
+SAME+=		tr_TR.UTF-8 es_ES.ISO8859-1
+SAME+=		tr_TR.UTF-8 es_CR.UTF-8
+SAME+=		tr_TR.UTF-8 es_AR.UTF-8
+SAME+=		tr_TR.UTF-8 es_AR.ISO8859-1
+SAME+=		tr_TR.UTF-8 el_GR.UTF-8
+SAME+=		tr_TR.UTF-8 el_GR.ISO8859-7
+SAME+=		tr_TR.UTF-8 de_DE.UTF-8
+SAME+=		tr_TR.UTF-8 de_DE.ISO8859-15
+SAME+=		tr_TR.UTF-8 de_DE.ISO8859-1
+SAME+=		tr_TR.UTF-8 de_AT.UTF-8
+SAME+=		tr_TR.UTF-8 de_AT.ISO8859-15
+SAME+=		tr_TR.UTF-8 de_AT.ISO8859-1
+SAME+=		tr_TR.UTF-8 da_DK.UTF-8
+SAME+=		tr_TR.UTF-8 da_DK.ISO8859-15
+SAME+=		tr_TR.UTF-8 da_DK.ISO8859-1
+SAME+=		tr_TR.UTF-8 ca_IT.UTF-8
+SAME+=		tr_TR.UTF-8 ca_IT.ISO8859-15
+SAME+=		tr_TR.UTF-8 ca_IT.ISO8859-1
+SAME+=		tr_TR.UTF-8 ca_FR.UTF-8
+SAME+=		tr_TR.UTF-8 ca_FR.ISO8859-15
+SAME+=		tr_TR.UTF-8 ca_FR.ISO8859-1
+SAME+=		tr_TR.UTF-8 ca_ES.UTF-8
+SAME+=		tr_TR.UTF-8 ca_ES.ISO8859-15
+SAME+=		tr_TR.UTF-8 ca_ES.ISO8859-1
+SAME+=		tr_TR.UTF-8 ca_AD.UTF-8
+SAME+=		tr_TR.UTF-8 ca_AD.ISO8859-15
+SAME+=		tr_TR.UTF-8 ca_AD.ISO8859-1
+SAME+=		tr_TR.UTF-8 ar_MA.UTF-8
+SAME+=		ru_RU.CP866 be_BY.CP1131
+SAME+=		it_CH.UTF-8 it_CH.ISO8859-15
+SAME+=		it_CH.UTF-8 it_CH.ISO8859-1
+SAME+=		it_CH.UTF-8 de_CH.UTF-8
+SAME+=		it_CH.UTF-8 de_CH.ISO8859-15
+SAME+=		it_CH.UTF-8 de_CH.ISO8859-1
+SAME+=		fr_CH.ISO8859-15 fr_CH.ISO8859-1
+SAME+=		hi_IN.UTF-8 hi_IN.ISCII-DEV
+SAME+=		hy_AM.UTF-8 hy_AM.ARMSCII-8
+SAME+=		uk_UA.KOI8-U ru_RU.KOI8-R
+SAME+=		sr_Latn_RS.UTF-8 sr_Latn_RS.ISO8859-2
+SAME+=		sr_Latn_RS.UTF-8 sr_Cyrl_RS.UTF-8
+SAME+=		sr_Latn_RS.UTF-8 sr_Cyrl_RS.ISO8859-5
+SAME+=		ko_KR.eucKR ko_KR.CP949	# legacy (same charset)
 
 FILES=		${LOCALES:S/$/.out/}
 CLEANFILES=	${FILES}
 
-.for f in ${SAME}
-SYMLINKS+=	../${f:C/:.*$//}/${FILESNAME} \
-    ${LOCALEDIR}/${f:C/^.*://}/${FILESNAME}
+.for f t in ${SAME}
+SYMLINKS+=	../$f/${FILESNAME} \
+    ${LOCALEDIR}/$t/${FILESNAME}
 .endfor
 
 .for f in ${LOCALES}
diff --git a/share/timedef/Makefile b/share/timedef/Makefile
index dde32a2..9373437 100644
--- a/share/timedef/Makefile
+++ b/share/timedef/Makefile
@@ -132,83 +132,83 @@ LOCALES+=	zh_Hant_HK.UTF-8
 LOCALES+=	zh_Hant_TW.Big5
 LOCALES+=	zh_Hant_TW.UTF-8
 
-SAME+=		af_ZA.UTF-8:af_ZA.ISO8859-15
-SAME+=		af_ZA.UTF-8:af_ZA.ISO8859-1
-SAME+=		ar_SA.UTF-8:ar_QA.UTF-8
-SAME+=		ar_SA.UTF-8:ar_EG.UTF-8
-SAME+=		ar_SA.UTF-8:ar_AE.UTF-8
-SAME+=		ca_IT.ISO8859-15:ca_IT.ISO8859-1
-SAME+=		ca_IT.ISO8859-15:ca_FR.ISO8859-15
-SAME+=		ca_IT.ISO8859-15:ca_FR.ISO8859-1
-SAME+=		ca_IT.ISO8859-15:ca_ES.ISO8859-15
-SAME+=		ca_IT.ISO8859-15:ca_ES.ISO8859-1
-SAME+=		ca_IT.ISO8859-15:ca_AD.ISO8859-15
-SAME+=		ca_IT.ISO8859-15:ca_AD.ISO8859-1
-SAME+=		ca_IT.UTF-8:ca_FR.UTF-8
-SAME+=		ca_IT.UTF-8:ca_ES.UTF-8
-SAME+=		ca_IT.UTF-8:ca_AD.UTF-8
-SAME+=		da_DK.ISO8859-15:da_DK.ISO8859-1
-SAME+=		de_AT.ISO8859-15:de_AT.ISO8859-1
-SAME+=		de_DE.ISO8859-15:de_DE.ISO8859-1
-SAME+=		de_DE.ISO8859-15:de_CH.ISO8859-15
-SAME+=		de_DE.ISO8859-15:de_CH.ISO8859-1
-SAME+=		de_DE.UTF-8:de_CH.UTF-8
-SAME+=		en_HK.UTF-8:en_HK.ISO8859-1
-SAME+=		en_HK.UTF-8:en_AU.UTF-8
-SAME+=		en_HK.UTF-8:en_AU.US-ASCII
-SAME+=		en_HK.UTF-8:en_AU.ISO8859-15
-SAME+=		en_HK.UTF-8:en_AU.ISO8859-1
-SAME+=		en_CA.UTF-8:en_CA.US-ASCII
-SAME+=		en_CA.UTF-8:en_CA.ISO8859-15
-SAME+=		en_CA.UTF-8:en_CA.ISO8859-1
-SAME+=		en_GB.UTF-8:en_GB.US-ASCII
-SAME+=		en_GB.UTF-8:en_GB.ISO8859-15
-SAME+=		en_GB.UTF-8:en_GB.ISO8859-1
-SAME+=		en_IE.UTF-8:en_IE.ISO8859-15
-SAME+=		en_IE.UTF-8:en_IE.ISO8859-1
-SAME+=		en_SG.UTF-8:en_SG.ISO8859-1
-SAME+=		en_SG.UTF-8:en_NZ.UTF-8
-SAME+=		en_SG.UTF-8:en_NZ.US-ASCII
-SAME+=		en_SG.UTF-8:en_NZ.ISO8859-15
-SAME+=		en_SG.UTF-8:en_NZ.ISO8859-1
-SAME+=		en_US.UTF-8:en_US.US-ASCII
-SAME+=		en_US.UTF-8:en_US.ISO8859-15
-SAME+=		en_US.UTF-8:en_US.ISO8859-1
-SAME+=		en_ZA.UTF-8:en_ZA.US-ASCII
-SAME+=		en_ZA.UTF-8:en_ZA.ISO8859-15
-SAME+=		en_ZA.UTF-8:en_ZA.ISO8859-1
-SAME+=		es_CR.UTF-8:es_AR.UTF-8
-SAME+=		es_ES.ISO8859-15:es_ES.ISO8859-1
-SAME+=		et_EE.ISO8859-15:et_EE.ISO8859-1
-SAME+=		eu_ES.UTF-8:eu_ES.ISO8859-15
-SAME+=		eu_ES.UTF-8:eu_ES.ISO8859-1
-SAME+=		fi_FI.ISO8859-15:fi_FI.ISO8859-1
-SAME+=		fr_BE.ISO8859-15:fr_BE.ISO8859-1
-SAME+=		fr_CA.ISO8859-15:fr_CA.ISO8859-1
-SAME+=		fr_CH.ISO8859-15:fr_CH.ISO8859-1
-SAME+=		fr_FR.ISO8859-15:fr_FR.ISO8859-1
-SAME+=		is_IS.ISO8859-15:is_IS.ISO8859-1
-SAME+=		it_CH.ISO8859-15:it_CH.ISO8859-1
-SAME+=		it_IT.ISO8859-15:it_IT.ISO8859-1
-SAME+=		nb_NO.ISO8859-15:nb_NO.ISO8859-1
-SAME+=		nl_BE.UTF-8:nl_BE.ISO8859-15
-SAME+=		nl_BE.UTF-8:nl_BE.ISO8859-1
-SAME+=		nl_NL.UTF-8:nl_NL.ISO8859-15
-SAME+=		nl_NL.UTF-8:nl_NL.ISO8859-1
-SAME+=		nn_NO.ISO8859-15:nn_NO.ISO8859-1
-SAME+=		pt_PT.ISO8859-15:pt_PT.ISO8859-1
-SAME+=		sr_Latn_RS.UTF-8:sr_Cyrl_RS.UTF-8
-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+=		ko_KR.eucKR:ko_KR.CP949	# legacy (same charset)
+SAME+=		af_ZA.UTF-8 af_ZA.ISO8859-15
+SAME+=		af_ZA.UTF-8 af_ZA.ISO8859-1
+SAME+=		ar_SA.UTF-8 ar_QA.UTF-8
+SAME+=		ar_SA.UTF-8 ar_EG.UTF-8
+SAME+=		ar_SA.UTF-8 ar_AE.UTF-8
+SAME+=		ca_IT.ISO8859-15 ca_IT.ISO8859-1
+SAME+=		ca_IT.ISO8859-15 ca_FR.ISO8859-15
+SAME+=		ca_IT.ISO8859-15 ca_FR.ISO8859-1
+SAME+=		ca_IT.ISO8859-15 ca_ES.ISO8859-15
+SAME+=		ca_IT.ISO8859-15 ca_ES.ISO8859-1
+SAME+=		ca_IT.ISO8859-15 ca_AD.ISO8859-15
+SAME+=		ca_IT.ISO8859-15 ca_AD.ISO8859-1
+SAME+=		ca_IT.UTF-8 ca_FR.UTF-8
+SAME+=		ca_IT.UTF-8 ca_ES.UTF-8
+SAME+=		ca_IT.UTF-8 ca_AD.UTF-8
+SAME+=		da_DK.ISO8859-15 da_DK.ISO8859-1
+SAME+=		de_AT.ISO8859-15 de_AT.ISO8859-1
+SAME+=		de_DE.ISO8859-15 de_DE.ISO8859-1
+SAME+=		de_DE.ISO8859-15 de_CH.ISO8859-15
+SAME+=		de_DE.ISO8859-15 de_CH.ISO8859-1
+SAME+=		de_DE.UTF-8 de_CH.UTF-8
+SAME+=		en_HK.UTF-8 en_HK.ISO8859-1
+SAME+=		en_HK.UTF-8 en_AU.UTF-8
+SAME+=		en_HK.UTF-8 en_AU.US-ASCII
+SAME+=		en_HK.UTF-8 en_AU.ISO8859-15
+SAME+=		en_HK.UTF-8 en_AU.ISO8859-1
+SAME+=		en_CA.UTF-8 en_CA.US-ASCII
+SAME+=		en_CA.UTF-8 en_CA.ISO8859-15
+SAME+=		en_CA.UTF-8 en_CA.ISO8859-1
+SAME+=		en_GB.UTF-8 en_GB.US-ASCII
+SAME+=		en_GB.UTF-8 en_GB.ISO8859-15
+SAME+=		en_GB.UTF-8 en_GB.ISO8859-1
+SAME+=		en_IE.UTF-8 en_IE.ISO8859-15
+SAME+=		en_IE.UTF-8 en_IE.ISO8859-1
+SAME+=		en_SG.UTF-8 en_SG.ISO8859-1
+SAME+=		en_SG.UTF-8 en_NZ.UTF-8
+SAME+=		en_SG.UTF-8 en_NZ.US-ASCII
+SAME+=		en_SG.UTF-8 en_NZ.ISO8859-15
+SAME+=		en_SG.UTF-8 en_NZ.ISO8859-1
+SAME+=		en_US.UTF-8 en_US.US-ASCII
+SAME+=		en_US.UTF-8 en_US.ISO8859-15
+SAME+=		en_US.UTF-8 en_US.ISO8859-1
+SAME+=		en_ZA.UTF-8 en_ZA.US-ASCII
+SAME+=		en_ZA.UTF-8 en_ZA.ISO8859-15
+SAME+=		en_ZA.UTF-8 en_ZA.ISO8859-1
+SAME+=		es_CR.UTF-8 es_AR.UTF-8
+SAME+=		es_ES.ISO8859-15 es_ES.ISO8859-1
+SAME+=		et_EE.ISO8859-15 et_EE.ISO8859-1
+SAME+=		eu_ES.UTF-8 eu_ES.ISO8859-15
+SAME+=		eu_ES.UTF-8 eu_ES.ISO8859-1
+SAME+=		fi_FI.ISO8859-15 fi_FI.ISO8859-1
+SAME+=		fr_BE.ISO8859-15 fr_BE.ISO8859-1
+SAME+=		fr_CA.ISO8859-15 fr_CA.ISO8859-1
+SAME+=		fr_CH.ISO8859-15 fr_CH.ISO8859-1
+SAME+=		fr_FR.ISO8859-15 fr_FR.ISO8859-1
+SAME+=		is_IS.ISO8859-15 is_IS.ISO8859-1
+SAME+=		it_CH.ISO8859-15 it_CH.ISO8859-1
+SAME+=		it_IT.ISO8859-15 it_IT.ISO8859-1
+SAME+=		nb_NO.ISO8859-15 nb_NO.ISO8859-1
+SAME+=		nl_BE.UTF-8 nl_BE.ISO8859-15
+SAME+=		nl_BE.UTF-8 nl_BE.ISO8859-1
+SAME+=		nl_NL.UTF-8 nl_NL.ISO8859-15
+SAME+=		nl_NL.UTF-8 nl_NL.ISO8859-1
+SAME+=		nn_NO.ISO8859-15 nn_NO.ISO8859-1
+SAME+=		pt_PT.ISO8859-15 pt_PT.ISO8859-1
+SAME+=		sr_Latn_RS.UTF-8 sr_Cyrl_RS.UTF-8
+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+=		ko_KR.eucKR ko_KR.CP949	# legacy (same charset)
 
 FILES=		${LOCALES:S/$/.out/}
 CLEANFILES=	${FILES}
 
-.for f in ${SAME}
-SYMLINKS+=	../${f:C/:.*$//}/${FILESNAME} \
-    ${LOCALEDIR}/${f:C/^.*://}/${FILESNAME}
+.for f t in ${SAME}
+SYMLINKS+=	../$f/${FILESNAME} \
+    ${LOCALEDIR}/$t/${FILESNAME}
 .endfor
 
 .for f in ${LOCALES}
diff --git a/tools/tools/locale/tools/cldr2def.pl b/tools/tools/locale/tools/cldr2def.pl
index 3b8169f..70ef375 100755
--- a/tools/tools/locale/tools/cldr2def.pl
+++ b/tools/tools/locale/tools/cldr2def.pl
@@ -815,9 +815,9 @@ sub make_makefile {
 		$MAPLOC = "MAPLOC=\t\t\${.CURDIR}/../../tools/tools/" .
 				"locale/etc/final-maps\n";
 		$SRCOUT3 = "## SYMPAIRS\n\n" .
-			".for PAIR in \${SYMPAIRS}\n" .
-			"\${PAIR:C/^.*://:S/src\$/LC_CTYPE/}: " .
-			"\${PAIR:C/:.*//}\n" .
+			".for s t in \${SYMPAIRS}\n" .
+			"\${t:S/src\$/LC_CTYPE/}: " .
+			"\$s\n" .
 			"\tlocaledef -D -U -c -w \${MAPLOC}/widths.txt \\\n" .
 			"\t-f \${MAPLOC}/map.\${.TARGET:T:R:C/^.*\\.//} " .
 			"\\\n\t-i \${.ALLSRC} \${.OBJDIR}/\${.TARGET:T:R} " .
@@ -891,7 +891,7 @@ EOF
 				my @a = split(/_/, $file);
 				my @b = split(/\./, $a[-1]);
 				$file =~ s/_x_/_/;
-				print FOUT "SAME+=\t\t$link:$file\n";
+				print FOUT "SAME+=\t\t$link $file\n";
 				undef($languages{$a[0]}{$a[1]}{data}{$b[0]}{$b[1]});
 			}
 		}
@@ -923,7 +923,7 @@ EOF
 				my $file = $l . "_";
 				$file .= $f . "_" if ($f ne "x");
 				$file .= $c;
-				print FOUT "SAME+=\t\t$file.$e:$languages{$l}{$f}{nc_link}.$e\t# legacy (lang/country change)\n";
+				print FOUT "SAME+=\t\t$file.$e $languages{$l}{$f}{nc_link}.$e\t# legacy (lang/country change)\n";
 			}
 		}
 
@@ -933,7 +933,7 @@ EOF
 				my $file = $l . "_";
 				$file .= $f . "_" if ($f ne "x");
 				$file .= $c;
-				print FOUT "SAME+=\t\t$file.$a[0]:$file.$a[1]\t# legacy (same charset)\n";
+				print FOUT "SAME+=\t\t$file.$a[0] $file.$a[1]\t# legacy (same charset)\n";
 			}
 		}
 
@@ -946,9 +946,9 @@ EOF
 FILES=		\${LOCALES:S/\$/.${SRCOUT2}/}
 CLEANFILES=	\${FILES}
 
-.for f in \${SAME}
-SYMLINKS+=	../\${f:C/:.*\$//}/\${FILESNAME} \\
-    \${LOCALEDIR}/\${f:C/^.*://}/\${FILESNAME}
+.for f t in \${SAME}
+SYMLINKS+=	../\$f/\${FILESNAME} \\
+    \${LOCALEDIR}/\$t/\${FILESNAME}
 .endfor
 
 .for f in \${LOCALES}
diff --git a/tools/tools/locale/tools/finalize b/tools/tools/locale/tools/finalize
index f8c0ce9..550f57c 100755
--- a/tools/tools/locale/tools/finalize
+++ b/tools/tools/locale/tools/finalize
@@ -1,5 +1,7 @@
 #!/bin/sh
 #
+# $FreeBSD$
+#
 # This is a helper script for the Makefile in the parent directory.
 # When the localization definitions are generated in the draft area,
 # this script will copy base ones that others symlink to, and rearrange
@@ -43,7 +45,7 @@ for original in ${keep}
 do
 	cp ${old}/${original} ${new}/
 done
-awk '{ if ($1 == last1) { print "SYMPAIRS+=\t" last2 ":" $2 } \
+awk '{ if ($1 == last1) { print "SYMPAIRS+=\t" last2 " " $2 } \
 else {last1 = $1; last2 = $2}}' ${TEMP2} > ${TEMP3}
 rm -f ${TEMP2}
 	/usr/bin/sed -E -e 's/[ ]+/ /g' \