svn commit: r197893 - in user/edwin/locale/share: . colldef
monetdef msgdef timedef
Edwin Groothuis
edwin at FreeBSD.org
Fri Oct 9 06:53:36 UTC 2009
Author: edwin
Date: Fri Oct 9 06:53:36 2009
New Revision: 197893
URL: http://svn.freebsd.org/changeset/base/197893
Log:
Change the definition of CMSLINK_xx_XX.cm: It can only point to
charactermaps, not the cc_CC.charactermaps.
Modified:
user/edwin/locale/share/Makefile.def.inc
user/edwin/locale/share/colldef/Makefile
user/edwin/locale/share/monetdef/Makefile
user/edwin/locale/share/msgdef/Makefile
user/edwin/locale/share/timedef/Makefile
Modified: user/edwin/locale/share/Makefile.def.inc
==============================================================================
--- user/edwin/locale/share/Makefile.def.inc Fri Oct 9 03:03:26 2009 (r197892)
+++ user/edwin/locale/share/Makefile.def.inc Fri Oct 9 06:53:36 2009 (r197893)
@@ -174,8 +174,8 @@ SYMLINKS+= ../${ccln}.UTF-8/${LCTYPE} ${
.for ccln in ${CCLN}
. for cm in ${CMS}
. ifdef CMSLINK_${ccln}.${cm}
-. for cclncm in ${CMSLINK_${ccln}.${cm}}
-SYMLINKS+= ../${ccln}.${cm}/${LCTYPE} ${LOCALEDIR}/${cclncm}
+. for cmi in ${CMSLINK_${ccln}.${cm}}
+SYMLINKS+= ../${ccln}.${cm}/${LCTYPE} ${LOCALEDIR}/${ccln}.${cmi}
. endfor
. endif
. endfor
@@ -214,8 +214,8 @@ SYMLINKS+= ../${ccln}.UTF-8/${LCTYPE} ${
. for cclni in ${CCLNLINK_${ccln}}
. for cm in ${CMS}
. ifdef CMSLINK_${ccln}.${cm}
-. for cclncmi in ${CMSLINK_${ccln}.${cm}}
-SYMLINKS+= ../${ccln}.${cm}/${LCTYPE} ${LOCALEDIR}/${cclncmi:S/${ccln}/${cclni}/}
+. for cmi in ${CMSLINK_${ccln}.${cm}}
+SYMLINKS+= ../${ccln}.${cm}/${LCTYPE} ${LOCALEDIR}/${cclni}.${cmi}
. endfor
. endif
. endfor
@@ -329,7 +329,7 @@ ${ccln}.${cms}.src: ${ccln}.UTF-8.src
-t ${CMALIAS_${cms}} \
${_TRANSLATIONAFTER_${cms}} \
> ${.TARGET} \
- || rm ${.TARGET} && exit 0
+ || (rm ${.TARGET} && exit 1)
. endif
${ccln}.${cms}.out: ${ccln}.${cms}.src
@@ -366,62 +366,4 @@ beforeinstall:
shift; \
done
-.if defined(FULL)
-#
-# Maintainer Bag of Tricks
-#
-# Perform the following checks:
-# - Create all files defined with CCLN and (CMS_xx and CMSLINK_xx)
-# - See if all MD5 checksums for CMS_{ccln} are different.
-# - See if all MD5 checksums for CMSLINK_{ccln} are the same.
-#
-checkcms:
-. for ccln in ${CCLN}
- ../../usr.bin/unicode2utf8/unicode2utf8 \
- --cldr=${CLDRDIR} \
- --input=${ccln}.unicode \
- --output=${ccln}.UTF-8.src
- grep -v '^#' < ${ccln}.UTF-8.src > ${ccln}.UTF-8.out
-. for cms in ${CMS_${ccln}} ${CMSLINK_${ccln}}
- cat ${ccln}.UTF-8.src \
- ${_TRANSLATIONBEFORE_${cms}} | \
- ${ICONV_${ccln}.${cms}} \
- -f UTF-8 \
- -t ${CMALIAS_${cms}} \
- ${_TRANSLATIONAFTER_${cms}} \
- > ${ccln}.${cms}.src \
- || rm ${ccln}.${cms}.src && exit 0
- grep -v '^#' < ${ccln}.${cms}.src > ${ccln}.${cms}.out
-. endfor
-. endfor
- md5 -r *.out > /tmp/a
- FULL=1 ${MAKE} checkcms1
-
-. for ccln in ${CCLN}
-. for cms in UTF-8 ${CMS_${ccln}} ${CMSLINK_${ccln}}
-MD5SUM_${ccln}.${cms}!= grep ${ccln}.${cms}.out /tmp/a | awk '{ print $$1 }'
-. endfor
-. endfor
-
-#
-# Perform the following checks:
-# - See if all MD5 checksums for CMS_{ccln} are different.
-# - See if all MD5 checksums for CMSLINK_{ccln} are the same.
-#
-checkcms1:
-. for ccln in ${CCLN}
-. for cms in ${CMS_${ccln}}
- @if [ ${MD5SUM_${ccln}.${cms}} = ${MD5SUM_${ccln}.UTF-8} ]; then \
- echo Same: ${ccln}.UTF-8 - ${ccln}.${cms}; \
- fi
-. endfor
-. for cms in ${CMSLINK_${ccln}}
- @if [ ${MD5SUM_${ccln}.${cms}} != ${MD5SUM_${ccln}.UTF-8} ]; then \
- echo Different: ${ccln}.UTF-8 - ${ccln}.${cms}; \
- fi
-. endfor
-. endfor
-
-.endif
-
.include <bsd.prog.mk>
Modified: user/edwin/locale/share/colldef/Makefile
==============================================================================
--- user/edwin/locale/share/colldef/Makefile Fri Oct 9 03:03:26 2009 (r197892)
+++ user/edwin/locale/share/colldef/Makefile Fri Oct 9 06:53:36 2009 (r197893)
@@ -32,24 +32,24 @@ CMS_uk_UA= CP1251 ISO8859-5 KOI8-U
# For these locales, link the following charactermaps to the UTF-8 map.
# (unless the origin charactermap is defined)
-CMSLINK_ca_ES.ISO8859-1= ca_AD.ISO8859-1 ca_FR.ISO8859-1 ca_IT.ISO8859-1
-CMSLINK_ca_ES.ISO8859-15= ca_AD.ISO8859-15 ca_FR.ISO8859-15 ca_IT.ISO8859-15
-CMSLINK_cs_CZ.ISO8859-2= sk_SK.ISO8859-2
-CMSLINK_de_DE.ISO8859-1= de_AT.ISO8859-1 de_CH.ISO8859-1
-CMSLINK_de_DE.ISO8859-15= de_AT.ISO8859-15 de_CH.ISO8859-15
-CMSLINK_is_IS.ISO8859-1= zh_Hant_TW.Big5
-CMSLINK_no_NO.ISO8859-1= nb_NO.ISO8859-1 nn_NO.ISO8859-1
-CMSLINK_no_NO.ISO8859-15= nb_NO.ISO8859-15 nn_NO.ISO8859-15
-CMSLINK_pt_PT.ISO8859-1= pt_BR.ISO8859-1
-CMSLINK_la_LN.ISO8859-1= af_ZA.ISO8859-1 da_DK.ISO8859-1 en_AU.ISO8859-1 en_CA.ISO8859-1 en_GB.ISO8859-1 en_NZ.ISO8859-1 en_US.ISO8859-1 eu_ES.ISO8859-1 fi_FI.ISO8859-1 fr_BE.ISO8859-1 fr_CA.ISO8859-1 fr_CH.ISO8859-1 fr_FR.ISO8859-1 it_CH.ISO8859-1 it_IT.ISO8859-1 nl_BE.ISO8859-1 nl_NL.ISO8859-1 pt_BR.ISO8859-1 pt_PT.ISO8859-1
-CMSLINK_la_LN.ISO8859-2= hu_HU.ISO8859-2 ro_RO.ISO8859-2 sr_YU.ISO8859-2
-CMSLINK_la_LN.ISO8859-13= lt_LT.ISO8859-13 lv_LV.ISO8859-13
-CMSLINK_la_LN.ISO8859-15= af_ZA.ISO8859-15 da_DK.ISO8859-15 en_AU.ISO8859-15 en_CA.ISO8859-15 en_GB.ISO8859-15 en_NZ.ISO8859-15 en_US.ISO8859-15 eu_ES.ISO8859-15 fi_FI.ISO8859-15 fr_BE.ISO8859-15 fr_CA.ISO8859-15 fr_CH.ISO8859-15 fr_FR.ISO8859-15 it_CH.ISO8859-15 it_IT.ISO8859-15 nl_BE.ISO8859-15 nl_NL.ISO8859-15 pt_PT.ISO8859-15
-CMSLINK_la_LN.US-ASCII= af_ZA.UTF-8 am_ET.UTF-8 be_BY.UTF-8 bg_BG.UTF-8 ca_AD.UTF-8 ca_ES.UTF-8 ca_FR.UTF-8 ca_IT.UTF-8 cs_CZ.UTF-8 da_DK.UTF-8 de_AT.UTF-8 de_CH.UTF-8 de_DE.UTF-8 el_GR.UTF-8 en_AU.US-ASCII en_AU.UTF-8 en_CA.US-ASCII en_CA.UTF-8 en_GB.US-ASCII en_GB.UTF-8 en_IE.UTF-8 en_NZ.US-ASCII en_NZ.UTF-8 en_US.US-ASCII en_US.UTF-8 es_ES.UTF-8 et_EE.UTF-8 eu_ES.UTF-8 fi_FI.UTF-8 fr_BE.UTF-8 fr_CA.UTF-8 fr_CH.UTF-8 fr_FR.UTF-8 he_IL.UTF-8 hr_HR.UTF-8 hu_HU.UTF-8 hy_AM.UTF-8 is_IS.UTF-8 it_CH.UTF-8 it_IT.UTF-8 ja_JP.SJIS ja_JP.UTF-8 ja_JP.eucJP kk_KZ.UTF-8 ko_KR.CP949 ko_KR.UTF-8 ko_KR.eucKR lt_LT.UTF-8 lv_LV.UTF-8 mn_MN.UTF-8 nb_NO.UTF-8 nl_BE.UTF-8 nl_NL.UTF-8 nn_NO.UTF-8 no_NO.UTF-8 pl_PL.UTF-8 pt_BR.UTF-8 pt_PT.UTF-8 ro_RO.UTF-8 ru_RU.UTF-8 sk_SK.UTF-8 sl_SI.UTF-8 sr_YU.UTF-8 sv_SE.UTF-8 tr_TR.UTF-8 uk_UA.UTF-8 zh_Hans_CN.GB18030 zh_Hans_CN.GB2312 zh_Hans_CN.GBK zh_Hans_CN.UTF-8 zh_Hans_CN.eucCN zh_Hant_HK.Big5HKSCS zh_Hant_HK.UTF-8 zh_Hant_TW.UTF-8
+# None!
# For these locales, also create symlinks to the main locale.
#CCLNLINK_ccln= ccnln
-# None!
+CCLNLINK_ca_ES.ISO8859-1= ca_AD.ISO8859-1 ca_FR.ISO8859-1 ca_IT.ISO8859-1
+CCLNLINK_ca_ES.ISO8859-15= ca_AD.ISO8859-15 ca_FR.ISO8859-15 ca_IT.ISO8859-15
+CCLNLINK_cs_CZ.ISO8859-2= sk_SK.ISO8859-2
+CCLNLINK_de_DE.ISO8859-1= de_AT.ISO8859-1 de_CH.ISO8859-1
+CCLNLINK_de_DE.ISO8859-15= de_AT.ISO8859-15 de_CH.ISO8859-15
+CCLNLINK_is_IS.ISO8859-1= zh_Hant_TW.Big5
+CCLNLINK_no_NO.ISO8859-1= nb_NO.ISO8859-1 nn_NO.ISO8859-1
+CCLNLINK_no_NO.ISO8859-15= nb_NO.ISO8859-15 nn_NO.ISO8859-15
+CCLNLINK_pt_PT.ISO8859-1= pt_BR.ISO8859-1
+CCLNLINK_la_LN.ISO8859-1= af_ZA.ISO8859-1 da_DK.ISO8859-1 en_AU.ISO8859-1 en_CA.ISO8859-1 en_GB.ISO8859-1 en_NZ.ISO8859-1 en_US.ISO8859-1 eu_ES.ISO8859-1 fi_FI.ISO8859-1 fr_BE.ISO8859-1 fr_CA.ISO8859-1 fr_CH.ISO8859-1 fr_FR.ISO8859-1 it_CH.ISO8859-1 it_IT.ISO8859-1 nl_BE.ISO8859-1 nl_NL.ISO8859-1 pt_BR.ISO8859-1 pt_PT.ISO8859-1
+CCLNLINK_la_LN.ISO8859-2= hu_HU.ISO8859-2 ro_RO.ISO8859-2 sr_YU.ISO8859-2
+CCLNLINK_la_LN.ISO8859-13= lt_LT.ISO8859-13 lv_LV.ISO8859-13
+CCLNLINK_la_LN.ISO8859-15= af_ZA.ISO8859-15 da_DK.ISO8859-15 en_AU.ISO8859-15 en_CA.ISO8859-15 en_GB.ISO8859-15 en_NZ.ISO8859-15 en_US.ISO8859-15 eu_ES.ISO8859-15 fi_FI.ISO8859-15 fr_BE.ISO8859-15 fr_CA.ISO8859-15 fr_CH.ISO8859-15 fr_FR.ISO8859-15 it_CH.ISO8859-15 it_IT.ISO8859-15 nl_BE.ISO8859-15 nl_NL.ISO8859-15 pt_PT.ISO8859-15
+CCLNLINK_la_LN.US-ASCII= af_ZA.UTF-8 am_ET.UTF-8 be_BY.UTF-8 bg_BG.UTF-8 ca_AD.UTF-8 ca_ES.UTF-8 ca_FR.UTF-8 ca_IT.UTF-8 cs_CZ.UTF-8 da_DK.UTF-8 de_AT.UTF-8 de_CH.UTF-8 de_DE.UTF-8 el_GR.UTF-8 en_AU.US-ASCII en_AU.UTF-8 en_CA.US-ASCII en_CA.UTF-8 en_GB.US-ASCII en_GB.UTF-8 en_IE.UTF-8 en_NZ.US-ASCII en_NZ.UTF-8 en_US.US-ASCII en_US.UTF-8 es_ES.UTF-8 et_EE.UTF-8 eu_ES.UTF-8 fi_FI.UTF-8 fr_BE.UTF-8 fr_CA.UTF-8 fr_CH.UTF-8 fr_FR.UTF-8 he_IL.UTF-8 hr_HR.UTF-8 hu_HU.UTF-8 hy_AM.UTF-8 is_IS.UTF-8 it_CH.UTF-8 it_IT.UTF-8 ja_JP.SJIS ja_JP.UTF-8 ja_JP.eucJP kk_KZ.UTF-8 ko_KR.CP949 ko_KR.UTF-8 ko_KR.eucKR lt_LT.UTF-8 lv_LV.UTF-8 mn_MN.UTF-8 nb_NO.UTF-8 nl_BE.UTF-8 nl_NL.UTF-8 nn_NO.UTF-8 no_NO.UTF-8 pl_PL.UTF-8 pt_BR.UTF-8 pt_PT.UTF-8 ro_RO.UTF-8 ru_RU.UTF-8 sk_SK.UTF-8 sl_SI.UTF-8 sr_YU.UTF-8 sv_SE.UTF-8 tr_TR.UTF-8 uk_UA.UTF-8 zh_Hans_CN.GB18030 zh_Hans_CN.GB2312 zh_Hans_CN.GBK zh_Hans_CN.UTF-8 zh_Hans_CN.eucCN zh_Hant_HK.Big5HKSCS zh_Hant_HK.UTF-8 zh_Hant_TW.UTF-8
# For these locales, create symlinks to the main locale for historical reasons.
# The ones for zh_XX are linked to la_LN because there are no
Modified: user/edwin/locale/share/monetdef/Makefile
==============================================================================
--- user/edwin/locale/share/monetdef/Makefile Fri Oct 9 03:03:26 2009 (r197892)
+++ user/edwin/locale/share/monetdef/Makefile Fri Oct 9 06:53:36 2009 (r197893)
@@ -40,7 +40,7 @@ CMSLINK_de_DE= ISO8859-1 ISO8859-15
CMSLINK_el_GR= ISO8859-7
CMSLINK_en_AU= ISO8859-1 ISO8859-15 US-ASCII
CMSLINK_en_CA= ISO8859-1 ISO8859-15 US-ASCII
-CMSLINK_en_GB.ISO8859-1= en_GB.ISO8859-15 en_GB.US-ASCII
+CMSLINK_en_GB.ISO8859-1= ISO8859-15 US-ASCII
CMSLINK_en_NZ= ISO8859-1 ISO8859-15 US-ASCII
CMSLINK_en_US= ISO8859-1 ISO8859-15 US-ASCII
CMSLINK_es_ES= ISO8859-1 ISO8859-15
@@ -53,8 +53,8 @@ CMSLINK_hr_HR= ISO8859-2
CMSLINK_hu_HU= ISO8859-2
CMSLINK_is_IS= ISO8859-1 ISO8859-15
CMSLINK_it_IT= ISO8859-1 ISO8859-15
-CMSLINK_ja_JP.eucJP= ja_JP.SJIS
-CMSLINK_ko_KR.eucKR= ko_KR.CP949
+CMSLINK_ja_JP.eucJP= SJIS
+CMSLINK_ko_KR.eucKR= CP949
CMSLINK_lt_LT= ISO8859-4 ISO8859-13
CMSLINK_nl_BE= ISO8859-1 ISO8859-15
CMSLINK_nl_NL= ISO8859-1 ISO8859-15
@@ -66,7 +66,7 @@ CMSLINK_sl_SI= ISO8859-2
CMSLINK_sr_Latn_RS= ISO8859-2
CMSLINK_sv_SE= ISO8859-1 ISO8859-15
CMSLINK_tr_TR= ISO8859-9
-CMSLINK_zh_Hans_CN.GB2312= zh_Hans_CN.GBK
+CMSLINK_zh_Hans_CN.GB2312= GBK
CMSLINK_zh_Hant_HK= Big5HKSCS
CMSLINK_zh_Hant_TW= Big5
Modified: user/edwin/locale/share/msgdef/Makefile
==============================================================================
--- user/edwin/locale/share/msgdef/Makefile Fri Oct 9 03:03:26 2009 (r197892)
+++ user/edwin/locale/share/msgdef/Makefile Fri Oct 9 06:53:36 2009 (r197893)
@@ -47,7 +47,7 @@ CMSLINK_hr_HR= ISO8859-2
CMSLINK_hu_HU= ISO8859-2
CMSLINK_is_IS= ISO8859-1 ISO8859-15
CMSLINK_it_IT= ISO8859-1 ISO8859-15
-CMSLINK_ko_KR.eucKR= ko_KR.CP949
+CMSLINK_ko_KR.eucKR= CP949
CMSLINK_lt_LT= ISO8859-4 ISO8859-13
CMSLINK_nl_NL= ISO8859-1 ISO8859-15
CMSLINK_no_NO= ISO8859-1 ISO8859-15
@@ -57,8 +57,7 @@ CMSLINK_ro_RO= ISO8859-2
CMSLINK_sl_SI= ISO8859-2
CMSLINK_sv_SE= ISO8859-1 ISO8859-15
CMSLINK_tr_TR= ISO8859-9
-CMSLINK_zh_Hans_CN.GB2312= zh_Hans_CN.GBK
-CMSLINK_zh_Hant_TW.Big5= zh_Hant_HK.Big5HKSCS
+CMSLINK_zh_Hans_CN.GB2312= GBK
# For these locales, also create symlinks to the main locale.
CCLNLINK_ca_ES= ca_AD ca_FR ca_IT
@@ -72,6 +71,7 @@ CCLNLINK_no_NO= nb_NO nn_NO
CCLNLINK_pt_PT= pt_BR
CCLNLINK_zh_Hant_TW= zh_Hant_HK
CCLNLINK_en_GB.UTF-8= en_IE.UTF-8
+CCLNLINK_zh_Hant_TW.Big5= zh_Hant_HK.Big5HKSCS
#
TRANSLATIONAFTER_ARMSCII-8= 5DA9:5D2E # ]. fixing
Modified: user/edwin/locale/share/timedef/Makefile
==============================================================================
--- user/edwin/locale/share/timedef/Makefile Fri Oct 9 03:03:26 2009 (r197892)
+++ user/edwin/locale/share/timedef/Makefile Fri Oct 9 06:53:36 2009 (r197893)
@@ -53,26 +53,26 @@ CMS_zh_Hant_TW= Big5
# For these locales, link the following charactermaps to the UTF-8 map.
# (unless the origin charactermap is defined)
-CMSLINK_ca_ES.ISO8859-1= ca_ES.ISO8859-15
-CMSLINK_da_DK.ISO8859-1= da_DK.ISO8859-15
-CMSLINK_de_AT.ISO8859-1= de_AT.ISO8859-15
-CMSLINK_de_DE.ISO8859-1= de_DE.ISO8859-15
+CMSLINK_ca_ES.ISO8859-1= ISO8859-15
+CMSLINK_da_DK.ISO8859-1= ISO8859-15
+CMSLINK_de_AT.ISO8859-1= ISO8859-15
+CMSLINK_de_DE.ISO8859-1= ISO8859-15
CMSLINK_en_GB= ISO8859-1 ISO8859-15 US-ASCII
CMSLINK_en_US= ISO8859-1 ISO8859-15 US-ASCII
-CMSLINK_es_ES.ISO8859-1= es_ES.ISO8859-15
+CMSLINK_es_ES.ISO8859-1= ISO8859-15
CMSLINK_eu_ES= ISO8859-1 ISO8859-15
-CMSLINK_fi_FI.ISO8859-1= fi_FI.ISO8859-15
-CMSLINK_fr_FR.ISO8859-1= fr_FR.ISO8859-15
-CMSLINK_is_IS.ISO8859-1= is_IS.ISO8859-15
-CMSLINK_it_IT.ISO8859-1= it_IT.ISO8859-15
-CMSLINK_ko_KR.eucKR= ko_KR.CP949
-CMSLINK_la_LN.ISO8859-1= la_LN.ISO8859-2 la_LN.ISO8859-4 la_LN.ISO8859-15 la_LN.US-ASCII
-CMSLINK_nb_NO.ISO8859-1= nb_NO.ISO8859-15
+CMSLINK_fi_FI.ISO8859-1= ISO8859-15
+CMSLINK_fr_FR.ISO8859-1= ISO8859-15
+CMSLINK_is_IS.ISO8859-1= ISO8859-15
+CMSLINK_it_IT.ISO8859-1= ISO8859-15
+CMSLINK_ko_KR.eucKR= CP949
+CMSLINK_la_LN.ISO8859-1= ISO8859-2 ISO8859-4 ISO8859-15 US-ASCII
+CMSLINK_nb_NO.ISO8859-1= ISO8859-15
CMSLINK_nl_NL= ISO8859-1 ISO8859-15
-CMSLINK_nn_NO.ISO8859-1= nn_NO.ISO8859-15
-CMSLINK_pt_PT.ISO8859-1= pt_PT.ISO8859-15
-CMSLINK_sv_SE.ISO8859-1= sv_SE.ISO8859-15
-CMSLINK_zh_Hans_CN.GB2312= zh_Hans_CN.GBK
+CMSLINK_nn_NO.ISO8859-1= ISO8859-15
+CMSLINK_pt_PT.ISO8859-1= ISO8859-15
+CMSLINK_sv_SE.ISO8859-1= ISO8859-15
+CMSLINK_zh_Hans_CN.GB2312= GBK
# For these locales, also create symlinks to the main locale.
CCLNLINK_en_US.UTF-8= af_ZA.UTF-8
More information about the svn-src-user
mailing list