Index: head/share/monetdef/sr_Latn_RS.UTF-8.src =================================================================== --- head/share/monetdef/sr_Latn_RS.UTF-8.src (revision 302025) +++ head/share/monetdef/sr_Latn_RS.UTF-8.src (revision 302026) @@ -1,50 +1,50 @@ # Warning: Do not edit. This file is automatically generated from the # tools in /usr/src/tools/tools/locale. The data is obtained from the # CLDR project, obtained from http://cldr.unicode.org/ # ----------------------------------------------------------------------------- # # int_curr_symbol (last character always SPACE) -RSD ""RSD +RSD # # currency_symbol -RSD""RSD +RSD # # mon_decimal_point -,"", +, # # mon_thousands_sep -."". +. # # mon_grouping -33 +3 # # positive_sign -"" + # # negative_sign --""- +- # # int_frac_digits -00 +0 # # frac_digits -00 +0 # # p_cs_precedes -00 +0 # # p_sep_by_space -11 +1 # # n_cs_precedes -00 +0 # # n_sep_by_space -11 +1 # # p_sign_posn -11 +1 # # n_sign_posn -11 +1 # EOF Index: head/share/msgdef/bg_BG.UTF-8.src =================================================================== --- head/share/msgdef/bg_BG.UTF-8.src (revision 302025) +++ head/share/msgdef/bg_BG.UTF-8.src (nonexistent) @@ -1,17 +0,0 @@ -# Warning: Do not edit. This file is automatically generated from the -# tools in /usr/src/tools/tools/locale. The data is obtained from the -# CLDR project, obtained from http://cldr.unicode.org/ -# ----------------------------------------------------------------------------- -# -# yesexpr -^(([дД]([аА])?)|([дД])|([yY]([eE][sS])?)|([yY])) -# -# noexpr -^(([нН]([еЕ])?)|([нН])|([nN]([oO])?)|([nN])) -# -# yesstr -да:д:ДА:Д:yes:y:YES:Y -# -# nostr -не:н:НЕ:Н:no:n:NO:N -# EOF Property changes on: head/share/msgdef/bg_BG.UTF-8.src ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/share/msgdef/sr_Latn_RS.ISO8859-2.src =================================================================== --- head/share/msgdef/sr_Latn_RS.ISO8859-2.src (revision 302025) +++ head/share/msgdef/sr_Latn_RS.ISO8859-2.src (nonexistent) @@ -1,17 +0,0 @@ -# Warning: Do not edit. This file is automatically generated from the -# tools in /usr/src/tools/tools/locale. The data is obtained from the -# CLDR project, obtained from http://cldr.unicode.org/ -# ----------------------------------------------------------------------------- -# -# yesexpr -^(([dD]([aA])?)|([dD])|([yY]([eE][sS])?)|([yY]))""^(([dD]([aA])?)|([dD])|([yY]([eE][sS])?)|([yY])) -# -# noexpr -^(([hH]([eE])?)|([hH])|([nN]([oO])?)|([nN]))""^(([nN]([eE])?)|([nN])|([nN]([oO])?)|([nN])) -# -# yesstr -da:d:DA:D:yes:y:YES:Y""da:d:DA:D:yes:y:YES:Y -# -# nostr -he:h:HE:H:no:n:NO:N""ne:n:NE:N:no:n:NO:N -# EOF Property changes on: head/share/msgdef/sr_Latn_RS.ISO8859-2.src ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/share/msgdef/sl_SI.UTF-8.src =================================================================== --- head/share/msgdef/sl_SI.UTF-8.src (revision 302025) +++ head/share/msgdef/sl_SI.UTF-8.src (nonexistent) @@ -1,17 +0,0 @@ -# Warning: Do not edit. This file is automatically generated from the -# tools in /usr/src/tools/tools/locale. The data is obtained from the -# CLDR project, obtained from http://cldr.unicode.org/ -# ----------------------------------------------------------------------------- -# -# yesexpr -^(([dD]([aA])?)|([dD])|([yY]([eE][sS])?)|([yY])) -# -# noexpr -^(([nN]([eE])?)|([nN])|([nN]([oO])?)|([nN])) -# -# yesstr -da:d:DA:D:yes:y:YES:Y -# -# nostr -ne:n:NE:N:no:n:NO:N -# EOF Property changes on: head/share/msgdef/sl_SI.UTF-8.src ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/share/msgdef/Makefile =================================================================== --- head/share/msgdef/Makefile (revision 302025) +++ head/share/msgdef/Makefile (revision 302026) @@ -1,219 +1,219 @@ # $FreeBSD$ # Warning: Do not edit. This file is automatically generated from the # tools in /usr/src/tools/tools/locale. LOCALEDIR= ${SHAREDIR}/locale FILESNAME= LC_MESSAGES .SUFFIXES: .src .out .src.out: grep -v -E '^(#$$|#[ ])' < ${.IMPSRC} > ${.TARGET} LOCALES+= am_ET.UTF-8 LOCALES+= ar_SA.UTF-8 LOCALES+= be_BY.CP1131 LOCALES+= be_BY.CP1251 LOCALES+= be_BY.ISO8859-5 LOCALES+= be_BY.UTF-8 LOCALES+= bg_BG.CP1251 -LOCALES+= bg_BG.UTF-8 LOCALES+= cs_CZ.UTF-8 LOCALES+= de_DE.UTF-8 LOCALES+= el_GR.ISO8859-7 LOCALES+= el_GR.UTF-8 LOCALES+= en_US.UTF-8 LOCALES+= es_MX.ISO8859-1 LOCALES+= es_MX.UTF-8 LOCALES+= et_EE.UTF-8 LOCALES+= eu_ES.UTF-8 LOCALES+= fi_FI.ISO8859-15 LOCALES+= fi_FI.UTF-8 LOCALES+= fr_FR.UTF-8 LOCALES+= he_IL.UTF-8 LOCALES+= hi_IN.ISCII-DEV LOCALES+= hi_IN.UTF-8 LOCALES+= hu_HU.UTF-8 LOCALES+= hy_AM.ARMSCII-8 LOCALES+= hy_AM.UTF-8 LOCALES+= is_IS.ISO8859-15 LOCALES+= is_IS.UTF-8 LOCALES+= it_IT.ISO8859-15 LOCALES+= it_IT.UTF-8 LOCALES+= ja_JP.SJIS LOCALES+= ja_JP.UTF-8 LOCALES+= ja_JP.eucJP LOCALES+= kk_Cyrl_KZ.UTF-8 LOCALES+= ko_KR.UTF-8 LOCALES+= ko_KR.eucKR LOCALES+= lt_LT.UTF-8 LOCALES+= lv_LV.ISO8859-13 LOCALES+= lv_LV.UTF-8 LOCALES+= mn_Cyrl_MN.UTF-8 LOCALES+= nb_NO.UTF-8 LOCALES+= nl_NL.UTF-8 LOCALES+= nn_NO.UTF-8 LOCALES+= pl_PL.UTF-8 LOCALES+= pt_PT.ISO8859-15 LOCALES+= pt_PT.UTF-8 LOCALES+= ro_RO.UTF-8 LOCALES+= ru_RU.CP1251 LOCALES+= ru_RU.CP866 LOCALES+= ru_RU.ISO8859-5 LOCALES+= ru_RU.KOI8-R LOCALES+= ru_RU.UTF-8 LOCALES+= se_NO.UTF-8 LOCALES+= sk_SK.ISO8859-2 LOCALES+= sk_SK.UTF-8 -LOCALES+= sl_SI.UTF-8 LOCALES+= sr_Cyrl_RS.ISO8859-5 -LOCALES+= sr_Latn_RS.ISO8859-2 +LOCALES+= sr_Cyrl_RS.UTF-8 LOCALES+= sr_Latn_RS.UTF-8 LOCALES+= sv_SE.UTF-8 LOCALES+= tr_TR.ISO8859-9 LOCALES+= tr_TR.UTF-8 LOCALES+= uk_UA.CP1251 LOCALES+= uk_UA.ISO8859-5 LOCALES+= uk_UA.KOI8-U LOCALES+= uk_UA.UTF-8 LOCALES+= zh_Hans_CN.GB2312 LOCALES+= zh_Hans_CN.GBK LOCALES+= zh_Hans_CN.UTF-8 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+= sr_Cyrl_RS.UTF-8 bg_BG.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+= sr_Latn_RS.UTF-8 sr_Latn_RS.ISO8859-2 +SAME+= sr_Latn_RS.UTF-8 sl_SI.UTF-8 +SAME+= sr_Latn_RS.UTF-8 sl_SI.ISO8859-2 +SAME+= sr_Latn_RS.UTF-8 hr_HR.UTF-8 +SAME+= sr_Latn_RS.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 t in ${SAME} SYMLINKS+= ../$f/${FILESNAME} \ ${LOCALEDIR}/$t/${FILESNAME} .endfor .for f in ${LOCALES} FILESDIR_${f}.out= ${LOCALEDIR}/${f} .endfor .include Index: head/share/msgdef/sr_Cyrl_RS.ISO8859-5.src =================================================================== --- head/share/msgdef/sr_Cyrl_RS.ISO8859-5.src (revision 302025) +++ head/share/msgdef/sr_Cyrl_RS.ISO8859-5.src (revision 302026) @@ -1,17 +1,17 @@ # Warning: Do not edit. This file is automatically generated from the # tools in /usr/src/tools/tools/locale. The data is obtained from the # CLDR project, obtained from http://cldr.unicode.org/ # ----------------------------------------------------------------------------- # # yesexpr -^(([Դ]([а])?)|([Դ])|([yY]([eE][sS])?)|([yY]))""^(([dD]([aA])?)|([dD])|([yY]([eE][sS])?)|([yY])) +^(([Դ]([а])?)|([Դ])|([yY]([eE][sS])?)|([yY])) # # noexpr -^(([ݽ]([յ])?)|([ݽ])|([nN]([oO])?)|([nN]))""^(([nN]([eE])?)|([nN])|([nN]([oO])?)|([nN])) +^(([ݽ]([յ])?)|([ݽ])|([nN]([oO])?)|([nN])) # # yesstr -::::yes:y:YES:Y""da:d:DA:D:yes:y:YES:Y +::::yes:y:YES:Y # # nostr -::::no:n:NO:N""ne:n:NE:N:no:n:NO:N +::::no:n:NO:N # EOF Index: head/share/msgdef/sr_Cyrl_RS.UTF-8.src =================================================================== --- head/share/msgdef/sr_Cyrl_RS.UTF-8.src (nonexistent) +++ head/share/msgdef/sr_Cyrl_RS.UTF-8.src (revision 302026) @@ -0,0 +1,17 @@ +# Warning: Do not edit. This file is automatically generated from the +# tools in /usr/src/tools/tools/locale. The data is obtained from the +# CLDR project, obtained from http://cldr.unicode.org/ +# ----------------------------------------------------------------------------- +# +# yesexpr +^(([дД]([аА])?)|([дД])|([yY]([eE][sS])?)|([yY])) +# +# noexpr +^(([нН]([еЕ])?)|([нН])|([nN]([oO])?)|([nN])) +# +# yesstr +да:д:ДА:Д:yes:y:YES:Y +# +# nostr +не:н:НЕ:Н:no:n:NO:N +# EOF Property changes on: head/share/msgdef/sr_Cyrl_RS.UTF-8.src ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/share/msgdef/sr_Latn_RS.UTF-8.src =================================================================== --- head/share/msgdef/sr_Latn_RS.UTF-8.src (revision 302025) +++ head/share/msgdef/sr_Latn_RS.UTF-8.src (revision 302026) @@ -1,17 +1,17 @@ # Warning: Do not edit. This file is automatically generated from the # tools in /usr/src/tools/tools/locale. The data is obtained from the # CLDR project, obtained from http://cldr.unicode.org/ # ----------------------------------------------------------------------------- # # yesexpr -^(([дД]([аА])?)|([дД])|([yY]([eE][sS])?)|([yY]))""^(([dD]([aA])?)|([dD])|([yY]([eE][sS])?)|([yY])) +^(([dD]([aA])?)|([dD])|([yY]([eE][sS])?)|([yY])) # # noexpr -^(([нН]([еЕ])?)|([нН])|([nN]([oO])?)|([nN]))""^(([nN]([eE])?)|([nN])|([nN]([oO])?)|([nN])) +^(([nN]([eE])?)|([nN])|([nN]([oO])?)|([nN])) # # yesstr -да:д:ДА:Д:yes:y:YES:Y""da:d:DA:D:yes:y:YES:Y +da:d:DA:D:yes:y:YES:Y # # nostr -не:н:НЕ:Н:no:n:NO:N""ne:n:NE:N:no:n:NO:N +ne:n:NE:N:no:n:NO:N # EOF Index: head/share/numericdef/sr_Latn_RS.UTF-8.src =================================================================== --- head/share/numericdef/sr_Latn_RS.UTF-8.src (revision 302025) +++ head/share/numericdef/sr_Latn_RS.UTF-8.src (nonexistent) @@ -1,14 +0,0 @@ -# Warning: Do not edit. This file is automatically generated from the -# tools in /usr/src/tools/tools/locale. The data is obtained from the -# CLDR project, obtained from http://cldr.unicode.org/ -# ----------------------------------------------------------------------------- -# -# decimal_point -,"", -# -# thousands_sep -."". -# -# grouping -33 -# EOF Property changes on: head/share/numericdef/sr_Latn_RS.UTF-8.src ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/share/numericdef/Makefile =================================================================== --- head/share/numericdef/Makefile (revision 302025) +++ head/share/numericdef/Makefile (revision 302026) @@ -1,219 +1,219 @@ # $FreeBSD$ # Warning: Do not edit. This file is automatically generated from the # tools in /usr/src/tools/tools/locale. LOCALEDIR= ${SHAREDIR}/locale FILESNAME= LC_NUMERIC .SUFFIXES: .src .out .src.out: grep -v -E '^(#$$|#[ ])' < ${.IMPSRC} > ${.TARGET} LOCALES+= ar_SA.UTF-8 LOCALES+= en_US.UTF-8 LOCALES+= en_ZA.US-ASCII LOCALES+= fr_CH.ISO8859-15 LOCALES+= fr_CH.UTF-8 LOCALES+= hi_IN.UTF-8 LOCALES+= hy_AM.UTF-8 LOCALES+= it_CH.UTF-8 LOCALES+= ru_RU.CP866 -LOCALES+= sr_Latn_RS.UTF-8 LOCALES+= tr_TR.UTF-8 LOCALES+= uk_UA.ISO8859-5 LOCALES+= uk_UA.KOI8-U LOCALES+= uk_UA.UTF-8 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_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 sr_Latn_RS.UTF-8 +SAME+= tr_TR.UTF-8 sr_Latn_RS.ISO8859-2 +SAME+= tr_TR.UTF-8 sr_Cyrl_RS.UTF-8 +SAME+= tr_TR.UTF-8 sr_Cyrl_RS.ISO8859-5 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 t in ${SAME} SYMLINKS+= ../$f/${FILESNAME} \ ${LOCALEDIR}/$t/${FILESNAME} .endfor .for f in ${LOCALES} FILESDIR_${f}.out= ${LOCALEDIR}/${f} .endfor .include Index: head/share/timedef/en_HK.UTF-8.src =================================================================== --- head/share/timedef/en_HK.UTF-8.src (revision 302025) +++ head/share/timedef/en_HK.UTF-8.src (nonexistent) @@ -1,87 +0,0 @@ -# Warning: Do not edit. This file is automatically generated from the -# tools in /usr/src/tools/tools/locale. The data is obtained from the -# CLDR project, obtained from http://cldr.unicode.org/ -# ----------------------------------------------------------------------------- -# -# Short month names -Jan -Feb -Mar -Apr -May -Jun -Jul -Aug -Sep -Oct -Nov -Dec -# -# Long month names (as in a date) -January -February -March -April -May -June -July -August -September -October -November -December -# -# Short weekday names -Sun -Mon -Tue -Wed -Thu -Fri -Sat -# -# Long weekday names -Sunday -Monday -Tuesday -Wednesday -Thursday -Friday -Saturday -# -# X_fmt -%I:%M:%S %p -# -# x_fmt -%e/%m/%Y -# -# c_fmt -%A %e %B %Y at %I:%M:%S %p -# -# AM/PM -AM -PM -# -# date_fmt -%A %e %B %Y at %I:%M:%S %p %Z -# -# Long month names (without case ending) -January -February -March -April -May -June -July -August -September -October -November -December -# -# md_order -m -# -# ampm_fmt -%I:%M:%S %p -# EOF Property changes on: head/share/timedef/en_HK.UTF-8.src ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/share/timedef/Makefile =================================================================== --- head/share/timedef/Makefile (revision 302025) +++ head/share/timedef/Makefile (revision 302026) @@ -1,219 +1,219 @@ # $FreeBSD$ # Warning: Do not edit. This file is automatically generated from the # tools in /usr/src/tools/tools/locale. LOCALEDIR= ${SHAREDIR}/locale FILESNAME= LC_TIME .SUFFIXES: .src .out .src.out: grep -v -E '^(#$$|#[ ])' < ${.IMPSRC} > ${.TARGET} LOCALES+= af_ZA.UTF-8 LOCALES+= am_ET.UTF-8 LOCALES+= ar_JO.UTF-8 LOCALES+= ar_MA.UTF-8 LOCALES+= ar_SA.UTF-8 LOCALES+= be_BY.CP1131 LOCALES+= be_BY.CP1251 LOCALES+= be_BY.ISO8859-5 LOCALES+= be_BY.UTF-8 LOCALES+= bg_BG.CP1251 LOCALES+= bg_BG.UTF-8 LOCALES+= ca_IT.ISO8859-15 LOCALES+= ca_IT.UTF-8 LOCALES+= cs_CZ.ISO8859-2 LOCALES+= cs_CZ.UTF-8 LOCALES+= da_DK.ISO8859-15 LOCALES+= da_DK.UTF-8 LOCALES+= de_AT.ISO8859-15 LOCALES+= de_AT.UTF-8 LOCALES+= de_DE.ISO8859-15 LOCALES+= de_DE.UTF-8 LOCALES+= el_GR.ISO8859-7 LOCALES+= el_GR.UTF-8 LOCALES+= en_CA.UTF-8 LOCALES+= en_GB.UTF-8 -LOCALES+= en_HK.UTF-8 LOCALES+= en_IE.UTF-8 LOCALES+= en_PH.UTF-8 LOCALES+= en_SG.UTF-8 LOCALES+= en_US.UTF-8 LOCALES+= en_ZA.UTF-8 LOCALES+= es_AR.ISO8859-1 LOCALES+= es_CR.UTF-8 LOCALES+= es_ES.ISO8859-15 LOCALES+= es_ES.UTF-8 LOCALES+= es_MX.ISO8859-1 LOCALES+= es_MX.UTF-8 LOCALES+= et_EE.ISO8859-15 LOCALES+= et_EE.UTF-8 LOCALES+= eu_ES.UTF-8 LOCALES+= fi_FI.ISO8859-15 LOCALES+= fi_FI.UTF-8 LOCALES+= fr_BE.ISO8859-15 LOCALES+= fr_BE.UTF-8 LOCALES+= fr_CA.ISO8859-15 LOCALES+= fr_CA.UTF-8 LOCALES+= fr_CH.ISO8859-15 LOCALES+= fr_CH.UTF-8 LOCALES+= fr_FR.ISO8859-15 LOCALES+= fr_FR.UTF-8 LOCALES+= he_IL.UTF-8 LOCALES+= hi_IN.ISCII-DEV LOCALES+= hi_IN.UTF-8 LOCALES+= hr_HR.ISO8859-2 LOCALES+= hr_HR.UTF-8 LOCALES+= hu_HU.ISO8859-2 LOCALES+= hu_HU.UTF-8 LOCALES+= hy_AM.ARMSCII-8 LOCALES+= hy_AM.UTF-8 LOCALES+= is_IS.ISO8859-15 LOCALES+= is_IS.UTF-8 LOCALES+= it_CH.ISO8859-15 LOCALES+= it_CH.UTF-8 LOCALES+= it_IT.ISO8859-15 LOCALES+= it_IT.UTF-8 LOCALES+= ja_JP.SJIS LOCALES+= ja_JP.UTF-8 LOCALES+= ja_JP.eucJP LOCALES+= kk_Cyrl_KZ.UTF-8 LOCALES+= ko_KR.UTF-8 LOCALES+= ko_KR.eucKR LOCALES+= lt_LT.ISO8859-13 LOCALES+= lt_LT.UTF-8 LOCALES+= lv_LV.ISO8859-13 LOCALES+= lv_LV.UTF-8 LOCALES+= mn_Cyrl_MN.UTF-8 LOCALES+= nb_NO.ISO8859-15 LOCALES+= nb_NO.UTF-8 LOCALES+= nl_BE.UTF-8 LOCALES+= nl_NL.UTF-8 LOCALES+= nn_NO.ISO8859-15 LOCALES+= nn_NO.UTF-8 LOCALES+= pl_PL.ISO8859-2 LOCALES+= pl_PL.UTF-8 LOCALES+= pt_BR.ISO8859-1 LOCALES+= pt_BR.UTF-8 LOCALES+= pt_PT.ISO8859-15 LOCALES+= pt_PT.UTF-8 LOCALES+= ro_RO.ISO8859-2 LOCALES+= ro_RO.UTF-8 LOCALES+= ru_RU.CP1251 LOCALES+= ru_RU.CP866 LOCALES+= ru_RU.ISO8859-5 LOCALES+= ru_RU.KOI8-R LOCALES+= ru_RU.UTF-8 LOCALES+= se_FI.UTF-8 LOCALES+= se_NO.UTF-8 LOCALES+= sk_SK.ISO8859-2 LOCALES+= sk_SK.UTF-8 LOCALES+= sl_SI.ISO8859-2 LOCALES+= sl_SI.UTF-8 LOCALES+= sr_Cyrl_RS.ISO8859-5 +LOCALES+= sr_Cyrl_RS.UTF-8 LOCALES+= sr_Latn_RS.ISO8859-2 LOCALES+= sr_Latn_RS.UTF-8 LOCALES+= sv_FI.ISO8859-15 LOCALES+= sv_FI.UTF-8 LOCALES+= sv_SE.ISO8859-15 LOCALES+= sv_SE.UTF-8 LOCALES+= tr_TR.ISO8859-9 LOCALES+= tr_TR.UTF-8 LOCALES+= uk_UA.CP1251 LOCALES+= uk_UA.ISO8859-5 LOCALES+= uk_UA.KOI8-U LOCALES+= uk_UA.UTF-8 LOCALES+= zh_Hans_CN.GB2312 LOCALES+= zh_Hans_CN.GBK LOCALES+= zh_Hans_CN.UTF-8 LOCALES+= zh_Hans_CN.eucCN 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_PH.UTF-8 en_HK.UTF-8 +SAME+= en_PH.UTF-8 en_HK.ISO8859-1 +SAME+= en_PH.UTF-8 en_AU.UTF-8 +SAME+= en_PH.UTF-8 en_AU.US-ASCII +SAME+= en_PH.UTF-8 en_AU.ISO8859-15 +SAME+= en_PH.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 t in ${SAME} SYMLINKS+= ../$f/${FILESNAME} \ ${LOCALEDIR}/$t/${FILESNAME} .endfor .for f in ${LOCALES} FILESDIR_${f}.out= ${LOCALEDIR}/${f} .endfor .include Index: head/share/timedef/sr_Cyrl_RS.ISO8859-5.src =================================================================== --- head/share/timedef/sr_Cyrl_RS.ISO8859-5.src (revision 302025) +++ head/share/timedef/sr_Cyrl_RS.ISO8859-5.src (revision 302026) @@ -1,133 +1,87 @@ # Warning: Do not edit. This file is automatically generated from the # tools in /usr/src/tools/tools/locale. The data is obtained from the # CLDR project, obtained from http://cldr.unicode.org/ # ----------------------------------------------------------------------------- # # Short month names -""jan -feb -mar -apr -maj -jun -jul -avg -sep -okt -nov -dec + # # Long month names (as in a date) -""januar -februar -mart -april -maj -jun -jul -avgust -septembar -oktobar -novembar -decembar + # # Short weekday names -""ned -pon -uto -sre -cet -pet -sub + # # Long weekday names -""nedelja -ponedeljak -utorak -sreda -cetvrtak -petak -subota + # # X_fmt -%H.%M.%S""%H.%M.%S +%H.%M.%S # # x_fmt -%d.%m.%y.""%e.%m.%y. +%d.%m.%y. # # c_fmt -%d. %B %Y. %H.%M.%S""%d. %B %Y. %H.%M.%S %Z +%d. %B %Y. %H.%M.%S # # AM/PM - ""pre podne -po podne + # # date_fmt -%d. %B %Y. %H.%M.%S %Z""%d. %B %Y. %H.%M.%S %Z +%d. %B %Y. %H.%M.%S %Z # # Long month names (without case ending) -""januar -februar -mart -april -maj -jun -jul -avgust -septembar -oktobar -novembar -decembar + # # md_order -dmdm +dm # # ampm_fmt -%I.%M.%S %p""%I.%M.%S %p +%I.%M.%S %p # EOF Index: head/share/timedef/sr_Cyrl_RS.UTF-8.src =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: head/share/timedef/sr_Cyrl_RS.UTF-8.src ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: head/share/timedef/sr_Latn_RS.ISO8859-2.src =================================================================== --- head/share/timedef/sr_Latn_RS.ISO8859-2.src (revision 302025) +++ head/share/timedef/sr_Latn_RS.ISO8859-2.src (revision 302026) @@ -1,133 +1,87 @@ # Warning: Do not edit. This file is automatically generated from the # tools in /usr/src/tools/tools/locale. The data is obtained from the # CLDR project, obtained from http://cldr.unicode.org/ # ----------------------------------------------------------------------------- # # Short month names -jah +jan feb mar apr maj -juh -jul -abg -cep -okt -hob -dec""jan -feb -mar -apr -maj jun jul avg sep okt nov dec # # Long month names (as in a date) -jahuar +januar februar mart -aprjl -maj -juh -jul -abguct -ceptembar -oktobar -hobembar -decembar""januar -februar -mart april maj jun jul avgust septembar oktobar novembar decembar # # Short weekday names -hed -poh -uto -cre -et -pet -cub""ned +ned pon uto sre et pet sub # # Long weekday names -hedelja -pohedeljak -utorak -creda -etbrtak -petak -cubota""nedelja +nedelja ponedeljak utorak sreda etvrtak petak subota # # X_fmt -%H.%M.%S""%H.%M.%S +%H.%M.%S # # x_fmt -%d.%m.%y.""%d.%m.%y. +%d.%m.%y. # # c_fmt -%d. %B %Y. %H.%M.%S""%d. %B %Y. %H.%M.%S %Z +%d. %B %Y. %H.%M.%S # # AM/PM -pre podhe -po podhe""pre podne +pre podne po podne # # date_fmt -%d. %B %Y. %H.%M.%S %Z""%d. %B %Y. %H.%M.%S %Z +%d. %B %Y. %H.%M.%S %Z # # Long month names (without case ending) -jahuar +januar februar mart -aprjl -maj -juh -jul -abguct -ceptembar -oktobar -hobembar -decembar""januar -februar -mart april maj jun jul avgust septembar oktobar novembar decembar # # md_order -dmdm +dm # # ampm_fmt -%I.%M.%S %p""%I.%M.%S %p +%I.%M.%S %p # EOF Property changes on: head/share/timedef/sr_Latn_RS.ISO8859-2.src ___________________________________________________________________ Modified: svn:mime-type ## -1 +1 ## -text/plain; charset=UTF-8 \ No newline at end of property +text/plain \ No newline at end of property Index: head/share/timedef/sr_Latn_RS.UTF-8.src =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: head/share/timedef/sr_Latn_RS.UTF-8.src ___________________________________________________________________ Modified: svn:mime-type ## -1 +1 ## -application/octet-stream \ No newline at end of property +text/plain \ No newline at end of property Index: head/tools/tools/locale/tools/cldr2def.pl =================================================================== --- head/tools/tools/locale/tools/cldr2def.pl (revision 302025) +++ head/tools/tools/locale/tools/cldr2def.pl (revision 302026) @@ -1,1021 +1,1022 @@ #!/usr/local/bin/perl -wC # $FreeBSD$ use strict; use File::Copy; use XML::Parser; use Tie::IxHash; use Text::Iconv; use Data::Dumper; use Getopt::Long; use Digest::SHA qw(sha1_hex); require "charmaps.pm"; if ($#ARGV < 2) { print "Usage: $0 --cldr= --unidata= --etc= --type= [--lc=]\n"; exit(1); } my $DEFENCODING = "UTF-8"; my @filter = (); my $CLDRDIR = undef; my $UNIDATADIR = undef; my $ETCDIR = undef; my $TYPE = undef; my $doonly = undef; my $result = GetOptions ( "cldr=s" => \$CLDRDIR, "unidata=s" => \$UNIDATADIR, "etc=s" => \$ETCDIR, "type=s" => \$TYPE, "lc=s" => \$doonly ); my %convertors = (); my %ucd = (); my %values = (); my %hashtable = (); my %languages = (); my %translations = (); my %encodings = (); my %alternativemonths = (); get_languages(); my %utf8map = (); my %utf8aliases = (); get_unidata($UNIDATADIR); get_utf8map("$CLDRDIR/posix/$DEFENCODING.cm"); get_encodings("$ETCDIR/charmaps"); my %keys = (); tie(%keys, "Tie::IxHash"); tie(%hashtable, "Tie::IxHash"); my %FILESNAMES = ( "monetdef" => "LC_MONETARY", "timedef" => "LC_TIME", "msgdef" => "LC_MESSAGES", "numericdef" => "LC_NUMERIC", "colldef" => "LC_COLLATE", "ctypedef" => "LC_CTYPE" ); my %callback = ( mdorder => \&callback_mdorder, altmon => \&callback_altmon, cformat => \&callback_cformat, dformat => \&callback_dformat, dtformat => \&callback_dtformat, cbabmon => \&callback_abmon, cbampm => \&callback_ampm, data => undef, ); my %DESC = ( # numericdef "decimal_point" => "decimal_point", "thousands_sep" => "thousands_sep", "grouping" => "grouping", # monetdef "int_curr_symbol" => "int_curr_symbol (last character always " . "SPACE)", "currency_symbol" => "currency_symbol", "mon_decimal_point" => "mon_decimal_point", "mon_thousands_sep" => "mon_thousands_sep", "mon_grouping" => "mon_grouping", "positive_sign" => "positive_sign", "negative_sign" => "negative_sign", "int_frac_digits" => "int_frac_digits", "frac_digits" => "frac_digits", "p_cs_precedes" => "p_cs_precedes", "p_sep_by_space" => "p_sep_by_space", "n_cs_precedes" => "n_cs_precedes", "n_sep_by_space" => "n_sep_by_space", "p_sign_posn" => "p_sign_posn", "n_sign_posn" => "n_sign_posn", # msgdef "yesexpr" => "yesexpr", "noexpr" => "noexpr", "yesstr" => "yesstr", "nostr" => "nostr", # timedef "abmon" => "Short month names", "mon" => "Long month names (as in a date)", "abday" => "Short weekday names", "day" => "Long weekday names", "t_fmt" => "X_fmt", "d_fmt" => "x_fmt", "c_fmt" => "c_fmt", "am_pm" => "AM/PM", "d_t_fmt" => "date_fmt", "altmon" => "Long month names (without case ending)", "md_order" => "md_order", "t_fmt_ampm" => "ampm_fmt", ); if ($TYPE eq "colldef") { transform_collation(); make_makefile(); } if ($TYPE eq "ctypedef") { transform_ctypes(); make_makefile(); } if ($TYPE eq "numericdef") { %keys = ( "decimal_point" => "s", "thousands_sep" => "s", "grouping" => "ai", ); get_fields(); print_fields(); make_makefile(); } if ($TYPE eq "monetdef") { %keys = ( "int_curr_symbol" => "s", "currency_symbol" => "s", "mon_decimal_point" => "s", "mon_thousands_sep" => "s", "mon_grouping" => "ai", "positive_sign" => "s", "negative_sign" => "s", "int_frac_digits" => "i", "frac_digits" => "i", "p_cs_precedes" => "i", "p_sep_by_space" => "i", "n_cs_precedes" => "i", "n_sep_by_space" => "i", "p_sign_posn" => "i", "n_sign_posn" => "i" ); get_fields(); print_fields(); make_makefile(); } if ($TYPE eq "msgdef") { %keys = ( "yesexpr" => "s", "noexpr" => "s", "yesstr" => "s", "nostr" => "s" ); get_fields(); print_fields(); make_makefile(); } if ($TYPE eq "timedef") { %keys = ( "abmon" => " "as", "abday" => "as", "day" => "as", "t_fmt" => "s", "d_fmt" => " " " " " " "s", ); get_fields(); print_fields(); make_makefile(); } sub callback_ampm { my $s = shift; my $nl = $callback{data}{l} . "_" . $callback{data}{c}; my $enc = $callback{data}{e}; my $converter = Text::Iconv->new("utf-8", "$enc"); if ($nl eq 'ru_RU') { if ($enc eq 'UTF-8') { $s = 'дп;пп'; } else { $s = $converter->convert("дп;пп"); } } return $s; } sub callback_cformat { my $s = shift; my $nl = $callback{data}{l} . "_" . $callback{data}{c}; $s =~ s/\.,/\./; $s =~ s/ %Z//; $s =~ s/ %z//; $s =~ s/^"(%B %e, )/"%A, $1/; $s =~ s/^"(%e %B )/"%A $1/; return $s; }; sub callback_dformat { my $s = shift; $s =~ s/(%m(|[-.]))%e/$1%d/; $s =~ s/%e((|[-.])%m)/%d$1/; return $s; }; sub callback_dtformat { my $s = shift; my $nl = $callback{data}{l} . "_" . $callback{data}{c}; if ($nl eq 'ja_JP') { $s =~ s/(> )(%H)/$1%A $2/; } $s =~ s/\.,/\./; $s =~ s/^"(%B %e, )/"%A, $1/; $s =~ s/^"(%e %B )/"%A $1/; return $s; }; sub callback_mdorder { my $s = shift; return undef if (!defined $s); $s =~ s/[^dem]//g; $s =~ s/e/d/g; return $s; }; sub callback_altmon { # if the language/country is known in %alternative months then # return that, otherwise repeat mon my $s = shift; if (defined $alternativemonths{$callback{data}{l}}{$callback{data}{c}}) { my @altnames = split(";",$alternativemonths{$callback{data}{l}}{$callback{data}{c}}); my @cleaned; foreach (@altnames) { $_ =~ s/^\s+//; $_ =~ s/\s+$//; push @cleaned, $_; } return join(";",@cleaned); } return $s; } sub callback_abmon { # for specified CJK locales, pad result with a space to enable # columns to line up (style established in FreeBSD in 2001) my $s = shift; my $nl = $callback{data}{l} . "_" . $callback{data}{c}; if ($nl eq 'ja_JP' || $nl eq 'ko_KR' || $nl eq 'zh_CN' || $nl eq 'zh_HK' || $nl eq 'zh_TW') { my @monthnames = split(";", $s); my @cleaned; foreach (@monthnames) { if ($_ =~ /^"<(two|three|four|five|six|seven|eight|nine)>/ || ($_ =~ /^"/ && $_ !~ /^"(||)/)) { $_ =~ s/^"/"/; } push @cleaned, $_; } return join(";",@cleaned); } return $s; } ############################ sub get_unidata { my $directory = shift; open(FIN, "$directory/UnicodeData.txt") or die("Cannot open $directory/UnicodeData.txt");; my @lines = ; chomp(@lines); close(FIN); foreach my $l (@lines) { my @a = split(/;/, $l); $ucd{code2name}{"$a[0]"} = $a[1]; # Unicode name $ucd{name2code}{"$a[1]"} = $a[0]; # Unicode code } } sub get_utf8map { my $file = shift; open(FIN, $file); my @lines = ; close(FIN); chomp(@lines); my $prev_k = undef; my $prev_v = ""; my $incharmap = 0; foreach my $l (@lines) { $l =~ s/\r//; next if ($l =~ /^\#/); next if ($l eq ""); if ($l eq "CHARMAP") { $incharmap = 1; next; } next if (!$incharmap); last if ($l eq "END CHARMAP"); $l =~ /^<([^\s]+)>\s+(.*)/; my $k = $1; my $v = $2; $k =~ s/_/ /g; # unicode char string $v =~ s/\\x//g; # UTF-8 char code $utf8map{$k} = $v; $utf8aliases{$k} = $prev_k if ($prev_v eq $v); $prev_v = $v; $prev_k = $k; } } sub get_encodings { my $dir = shift; foreach my $e (sort(keys(%encodings))) { if (!open(FIN, "$dir/$e.TXT")) { print "Cannot open charmap for $e\n"; next; } $encodings{$e} = 1; my @lines = ; close(FIN); chomp(@lines); foreach my $l (@lines) { $l =~ s/\r//; next if ($l =~ /^\#/); next if ($l eq ""); my @a = split(" ", $l); next if ($#a < 1); $a[0] =~ s/^0[xX]//; # local char code $a[1] =~ s/^0[xX]//; # unicode char code $convertors{$e}{uc($a[1])} = uc($a[0]); } } } sub get_languages { my %data = get_xmldata($ETCDIR); %languages = %{$data{L}}; %translations = %{$data{T}}; %alternativemonths = %{$data{AM}}; %encodings = %{$data{E}}; return if (!defined $doonly); my @a = split(/_/, $doonly); if ($#a == 1) { $filter[0] = $a[0]; $filter[1] = "x"; $filter[2] = $a[1]; } elsif ($#a == 2) { $filter[0] = $a[0]; $filter[1] = $a[1]; $filter[2] = $a[2]; } print Dumper(@filter); return; } sub transform_ctypes { foreach my $l (sort keys(%languages)) { foreach my $f (sort keys(%{$languages{$l}})) { foreach my $c (sort keys(%{$languages{$l}{$f}{data}})) { next if ($#filter == 2 && ($filter[0] ne $l || $filter[1] ne $f || $filter[2] ne $c)); next if (defined $languages{$l}{$f}{definitions} && $languages{$l}{$f}{definitions} !~ /$TYPE/); $languages{$l}{$f}{data}{$c}{$DEFENCODING} = 0; # unread my $file; $file = $l . "_"; $file .= $f . "_" if ($f ne "x"); $file .= $c; my $actfile = $file; my $filename = "$CLDRDIR/posix/xx_Comm_US.UTF-8.src"; if (! -f $filename) { print STDERR "Cannot open $filename\n"; next; } open(FIN, "$filename"); print "Reading from $filename for ${l}_${f}_${c}\n"; $languages{$l}{$f}{data}{$c}{$DEFENCODING} = 1; # read my @lines; my $shex; my $uhex; while () { push @lines, $_; } close(FIN); $shex = sha1_hex(join("\n", @lines)); $languages{$l}{$f}{data}{$c}{$DEFENCODING} = $shex; $hashtable{$shex}{"${l}_${f}_${c}.$DEFENCODING"} = 1; open(FOUT, ">$TYPE.draft/$actfile.$DEFENCODING.src"); print FOUT @lines; close(FOUT); foreach my $enc (sort keys(%{$languages{$l}{$f}{data}{$c}})) { next if ($enc eq $DEFENCODING); $filename = "$CLDRDIR/posix/$file.$DEFENCODING.src"; if (! -f $filename) { print STDERR "Cannot open $filename\n"; next; } @lines = (); open(FIN, "$filename"); while () { if ((/^comment_char\s/) || (/^escape_char\s/)){ push @lines, $_; } if (/^LC_CTYPE/../^END LC_CTYPE/) { push @lines, $_; } } close(FIN); $uhex = sha1_hex(join("\n", @lines) . $enc); $languages{$l}{$f}{data}{$c}{$enc} = $uhex; $hashtable{$uhex}{"${l}_${f}_${c}.$enc"} = 1; open(FOUT, ">$TYPE.draft/$actfile.$enc.src"); print FOUT <) { if ((/^comment_char\s/) || (/^escape_char\s/)){ push @lines, $_; } if (/^LC_COLLATE/../^END LC_COLLATE/) { $_ =~ s/[ ]+/ /g; push @lines, $_; } } close(FIN); $shex = sha1_hex(join("\n", @lines)); $languages{$l}{$f}{data}{$c}{$DEFENCODING} = $shex; $hashtable{$shex}{"${l}_${f}_${c}.$DEFENCODING"} = 1; open(FOUT, ">$TYPE.draft/$actfile.$DEFENCODING.src"); print FOUT <; chomp(@lines); close(FIN); my $continue = 0; foreach my $k (keys(%keys)) { foreach my $line (@lines) { $line =~ s/\r//; next if (!$continue && $line !~ /^$k\s/); if ($continue) { $line =~ s/^\s+//; } else { $line =~ s/^$k\s+//; } - $values{$l}{$c}{$k} = "" - if (!defined $values{$l}{$c}{$k}); + $values{$l}{$f}{$c}{$k} = "" + if (!defined $values{$l}{$f}{$c}{$k}); $continue = ($line =~ /\/$/); $line =~ s/\/$// if ($continue); while ($line =~ /_/) { $line =~ s/\<([^>_]+)_([^>]+)\>/<$1 $2>/; } die "_ in data - $line" if ($line =~ /_/); - $values{$l}{$c}{$k} .= $line; + $values{$l}{$f}{$c}{$k} .= $line; last if (!$continue); } } } } } } sub decodecldr { my $e = shift; my $s = shift; my $v = undef; if ($e eq "UTF-8") { # # Conversion to UTF-8 can be done from the Unicode name to # the UTF-8 character code. # $v = $utf8map{$s}; die "Cannot convert $s in $e (charmap)" if (!defined $v); } else { # # Conversion to these encodings can be done from the Unicode # name to Unicode code to the encodings code. # my $ucc = undef; $ucc = $ucd{name2code}{$s} if (defined $ucd{name2code}{$s}); $ucc = $ucd{name2code}{$utf8aliases{$s}} if (!defined $ucc && $utf8aliases{$s} && defined $ucd{name2code}{$utf8aliases{$s}}); if (!defined $ucc) { if (defined $translations{$e}{$s}{hex}) { $v = $translations{$e}{$s}{hex}; $ucc = 0; } elsif (defined $translations{$e}{$s}{ucc}) { $ucc = $translations{$e}{$s}{ucc}; } } die "Cannot convert $s in $e (ucd string)" if (!defined $ucc); $v = $convertors{$e}{$ucc} if (!defined $v); $v = $translations{$e}{$s}{hex} if (!defined $v && defined $translations{$e}{$s}{hex}); if (!defined $v && defined $translations{$e}{$s}{unicode}) { my $ucn = $translations{$e}{$s}{unicode}; $ucc = $ucd{name2code}{$ucn} if (defined $ucd{name2code}{$ucn}); $ucc = $ucd{name2code}{$utf8aliases{$ucn}} if (!defined $ucc && defined $ucd{name2code}{$utf8aliases{$ucn}}); $v = $convertors{$e}{$ucc}; } die "Cannot convert $s in $e (charmap)" if (!defined $v); } return pack("C", hex($v)) if (length($v) == 2); return pack("CC", hex(substr($v, 0, 2)), hex(substr($v, 2, 2))) if (length($v) == 4); return pack("CCC", hex(substr($v, 0, 2)), hex(substr($v, 2, 2)), hex(substr($v, 4, 2))) if (length($v) == 6); print STDERR "Cannot convert $e $s\n"; return "length = " . length($v); } sub translate { my $enc = shift; my $v = shift; return $translations{$enc}{$v} if (defined $translations{$enc}{$v}); return undef; } sub print_fields { foreach my $l (sort keys(%languages)) { foreach my $f (sort keys(%{$languages{$l}})) { foreach my $c (sort keys(%{$languages{$l}{$f}{data}})) { next if ($#filter == 2 && ($filter[0] ne $l || $filter[1] ne $f || $filter[2] ne $c)); next if (defined $languages{$l}{$f}{definitions} && $languages{$l}{$f}{definitions} !~ /$TYPE/); foreach my $enc (sort keys(%{$languages{$l}{$f}{data}{$c}})) { if ($languages{$l}{$f}{data}{$c}{$DEFENCODING} eq "0") { print "Skipping ${l}_" . ($f eq "x" ? "" : "${f}_") . "${c} - not read\n"; next; } my $file = $l; $file .= "_" . $f if ($f ne "x"); $file .= "_" . $c; print "Writing to $file in $enc\n"; if ($enc ne $DEFENCODING && !defined $convertors{$enc}) { print "Failed! Cannot convert to $enc.\n"; next; }; open(FOUT, ">$TYPE.draft/$file.$enc.new"); my $okay = 1; my $output = ""; print FOUT </) { - $k = substr($f, 1); - $f = $keys{$k}; + if ($g =~ /^>/) { + $k = substr($g, 1); + $g = $keys{$k}; } # Callback function - if ($f =~ /^\(.*)/) { my $p1 = $1; $cm = $2; my $p3 = $3; my $rv = decodecldr($enc, $cm); # $rv = translate($enc, $cm) # if (!defined $rv); if (!defined $rv) { print STDERR "Could not convert $k ($cm) from $DEFENCODING to $enc\n"; $okay = 0; next; } $v = $p1 . $rv . $p3; } $output .= "$v\n"; next; } - if ($f eq "as") { + if ($g eq "as") { foreach my $v (split(/;/, $v)) { $v =~ s/^"//; $v =~ s/"$//; my $cm = ""; while ($v =~ /^(.*?)<(.*?)>(.*)/) { my $p1 = $1; $cm = $2; my $p3 = $3; my $rv = decodecldr($enc, $cm); # $rv = translate($enc, # $cm) # if (!defined $rv); if (!defined $rv) { print STDERR "Could not convert $k ($cm) from $DEFENCODING to $enc\n"; $okay = 0; next; } $v = $1 . $rv . $3; } $output .= "$v\n"; } next; } - die("$k is '$f'"); + die("$k is '$g'"); } $languages{$l}{$f}{data}{$c}{$enc} = sha1_hex($output); $hashtable{sha1_hex($output)}{"${l}_${f}_${c}.$enc"} = 1; print FOUT "$output# EOF\n"; close(FOUT); if ($okay) { rename("$TYPE.draft/$file.$enc.new", "$TYPE.draft/$file.$enc.src"); } else { rename("$TYPE.draft/$file.$enc.new", "$TYPE.draft/$file.$enc.failed"); } } } } } } sub make_makefile { return if ($#filter > -1); print "Creating Makefile for $TYPE\n"; my $SRCOUT; my $SRCOUT2; my $SRCOUT3 = ""; my $SRCOUT4 = ""; my $MAPLOC; if ($TYPE eq "colldef") { $SRCOUT = "localedef -D -U -i \${.IMPSRC} \\\n" . "\t-f \${MAPLOC}/map.\${.TARGET:T:R:E} " . "\${.OBJDIR}/\${.IMPSRC:T:R}"; $MAPLOC = "MAPLOC=\t\t\${.CURDIR}/../../tools/tools/" . "locale/etc/final-maps\n"; $SRCOUT2 = "LC_COLLATE"; $SRCOUT3 = "" . ".for f t in \${LOCALES_MAPPED}\n" . "FILES+=\t\$t.LC_COLLATE\n" . "FILESDIR_\$t.LC_COLLATE=\t\${LOCALEDIR}/\$t\n" . "\$t.LC_COLLATE: \${.CURDIR}/\$f.src\n" . "\tlocaledef -D -U -i \${.ALLSRC} \\\n" . "\t\t-f \${MAPLOC}/map.\${.TARGET:T:R:E} \\\n" . "\t\t\${.OBJDIR}/\${.TARGET:T:R}\n" . ".endfor\n\n"; $SRCOUT4 = "## LOCALES_MAPPED\n"; } elsif ($TYPE eq "ctypedef") { $SRCOUT = "localedef -D -U -c -w \${MAPLOC}/widths.txt \\\n" . "\t-f \${MAPLOC}/map.\${.IMPSRC:T:R:E} " . "\\\n\t-i \${.IMPSRC} \${.OBJDIR}/\${.IMPSRC:T:R} " . " || true"; $SRCOUT2 = "LC_CTYPE"; $MAPLOC = "MAPLOC=\t\t\${.CURDIR}/../../tools/tools/" . "locale/etc/final-maps\n"; $SRCOUT3 = "## SYMPAIRS\n\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} " . " || true\n" . ".endfor\n\n"; } else { $SRCOUT = "grep -v -E '^(\#\$\$|\#[ ])' < \${.IMPSRC} > \${.TARGET}"; $SRCOUT2 = "out"; $MAPLOC = ""; } open(FOUT, ">$TYPE.draft/Makefile"); print FOUT < 0) { my $link = shift(@files); $link =~ s/_x_/_/; # strip family if none there foreach my $file (@files) { my @a = split(/_/, $file); my @b = split(/\./, $a[-1]); $file =~ s/_x_/_/; print FOUT "SAME+=\t\t$link $file\n"; undef($languages{$a[0]}{$a[1]}{data}{$b[0]}{$b[1]}); } } } foreach my $l (sort keys(%languages)) { foreach my $f (sort keys(%{$languages{$l}})) { foreach my $c (sort keys(%{$languages{$l}{$f}{data}})) { next if ($#filter == 2 && ($filter[0] ne $l || $filter[1] ne $f || $filter[2] ne $c)); next if (defined $languages{$l}{$f}{definitions} && $languages{$l}{$f}{definitions} !~ /$TYPE/); if (defined $languages{$l}{$f}{data}{$c}{$DEFENCODING} && $languages{$l}{$f}{data}{$c}{$DEFENCODING} eq "0") { print "Skipping ${l}_" . ($f eq "x" ? "" : "${f}_") . "${c} - not read\n"; next; } foreach my $e (sort keys(%{$languages{$l}{$f}{data}{$c}})) { my $file = $l . "_"; $file .= $f . "_" if ($f ne "x"); $file .= $c; next if (!defined $languages{$l}{$f}{data}{$c}{$e}); print FOUT "LOCALES+=\t$file.$e\n"; } if (defined $languages{$l}{$f}{nc_link}) { foreach my $e (sort keys(%{$languages{$l}{$f}{data}{$c}})) { 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"; } } if (defined $languages{$l}{$f}{e_link}) { foreach my $el (split(" ", $languages{$l}{$f}{e_link})) { my @a = split(/:/, $el); 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 < EOF close(FOUT); }