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

1 files changed, 122 insertions, 122 deletions

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}