imrcpan/freebsd
1
0 Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2026-10-28 11:25:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Posixify the locales name for variants

Browse Source 
For all locales with variants:
- if no ambiguity on the locale (only one variant) just use the regular name
- if ambiguity, pick one as default and append @<variant> to the others
  respecting POSIX

As a result:
- All the 3 components locales added recently are renamed to the usual 2
  components version for all but sr_RS.UTF-8
- Set sr_RS.UTF-8 to the cyrillic variant
- Add sr_RS.UTF-8@latin
- Remove the symlinks aliases they were created to represent the 2 components
  version as aliasas and are now useless
- Update the OptionalObsoleteFiles.inc and ObsoleteFiles.inc to reflect those
  changes

Discussed with:	ache@
Approved by:	re@ (gjb)
This commit is contained in:
Baptiste Daroussin committed 2016-07-03 18:21:11 +00:00
1 parent 46e47c4f8d
commit 3cf6509d70
57 files changed
+309 -257
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=302329
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ObsoleteFiles.inc
+99 -7
View File
@@ -38,6 +38,105 @@
# xargs -n1 | sort | uniq -d;
# done
# 20160703: POSIXify locales with variants
OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_COLLATE
OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_CTYPE
OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_MESSAGES
OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_MONETARY
OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_NUMERIC
OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_TIME
OLD_DIRS+=usr/share/locale/zh_Hant_TW.UTF-8
OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_COLLATE
OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_CTYPE
OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_MESSAGES
OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_MONETARY
OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_NUMERIC
OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_TIME
OLD_DIRS+=usr/share/locale/zh_Hant_TW.Big5
OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_COLLATE
OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_CTYPE
OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_MESSAGES
OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_MONETARY
OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_NUMERIC
OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_TIME
OLD_DIRS+=usr/share/locale/zh_Hant_HK.UTF-8
OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_COLLATE
OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_CTYPE
OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_MESSAGES
OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_MONETARY
OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_NUMERIC
OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_TIME
OLD_DIRS+=usr/share/locale/zh_Hans_CN.eucCN
OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_COLLATE
OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_CTYPE
OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_MESSAGES
OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_MONETARY
OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_NUMERIC
OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_TIME
OLD_DIRS+=usr/share/locale/zh_Hans_CN.UTF-8
OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_COLLATE
OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_CTYPE
OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_MESSAGES
OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_MONETARY
OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_NUMERIC
OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_TIME
OLD_DIRS+=usr/share/locale/zh_Hans_CN.GBK
OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_COLLATE
OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_CTYPE
OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_MESSAGES
OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_MONETARY
OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_NUMERIC
OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_TIME
OLD_DIRS+=usr/share/locale/zh_Hans_CN.GB2312
OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_COLLATE
OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_CTYPE
OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_MESSAGES
OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_MONETARY
OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_NUMERIC
OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_TIME
OLD_DIRS+=usr/share/locale/zh_Hans_CN.GB18030
OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_COLLATE
OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_CTYPE
OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_MESSAGES
OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_MONETARY
OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_NUMERIC
OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_TIME
OLD_DIRS+=usr/share/locale/sr_Latn_RS.UTF-8
OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_COLLATE
OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_CTYPE
OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_MESSAGES
OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_MONETARY
OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_NUMERIC
OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_TIME
OLD_DIRS+=usr/share/locale/sr_Latn_RS.ISO8859-2
OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_COLLATE
OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_CTYPE
OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_MESSAGES
OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_MONETARY
OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_NUMERIC
OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_TIME
OLD_DIRS+=usr/share/locale/sr_Cyrl_RS.UTF-8
OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_COLLATE
OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_CTYPE
OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_MESSAGES
OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_MONETARY
OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_NUMERIC
OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_TIME
OLD_DIRS+=usr/share/locale/sr_Cyrl_RS.ISO8859-5
OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_COLLATE
OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_CTYPE
OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_MESSAGES
OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_MONETARY
OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_NUMERIC
OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_TIME
OLD_DIRS+=usr/share/locale/mn_Cyrl_MN.UTF-8
OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_COLLATE
OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_CTYPE
OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_MESSAGES
OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_MONETARY
OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_NUMERIC
OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_TIME
OLD_DIRS+=usr/share/locale/kk_Cyrl_KZ.UTF-8
# 20160608: removed pam_verbose_error
OLD_LIBS+=usr/lib/libpam.so.5
OLD_LIBS+=usr/lib/pam_chroot.so.5
@@ -398,13 +497,6 @@ OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_MONETARY
OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_CTYPE
OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_NUMERIC
OLD_DIRS+=usr/share/locale/lt_LT.ISO8859-4
OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_COLLATE
OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_CTYPE
OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_MESSAGES
OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_MONETARY
OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_NUMERIC
OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_TIME
OLD_DIRS+=usr/share/locale/mn_MN.UTF-8
OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_COLLATE
OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_CTYPE
OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_MESSAGES
etc/mtree/BSD.usr.dist
+6 -22
View File
@@ -769,7 +769,7 @@
..
ja_JP.eucJP
..
kk_Cyrl_KZ.UTF-8
kk_KZ.UTF-8
..
ko_KR.CP949
..
@@ -785,7 +785,7 @@
..
lv_LV.UTF-8
..
mn_Cyrl_MN.UTF-8
mn_MN.UTF-8
..
nb_NO.ISO8859-1
..
@@ -851,13 +851,13 @@
..
sl_SI.UTF-8
..
sr_Cyrl_RS.ISO8859-5
sr_RS.ISO8859-5
..
sr_Cyrl_RS.UTF-8
sr_RS.UTF-8
..
sr_Latn_RS.ISO8859-2
sr_RS.ISO8859-2
..
sr_Latn_RS.UTF-8
sr_RS.UTF-8@latin
..
sv_FI.ISO8859-1
..
@@ -893,22 +893,6 @@
..
zh_CN.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.UTF-8
..
zh_Hant_TW.Big5
..
zh_Hant_TW.UTF-8
..
zh_HK.UTF-8
..
zh_TW.Big5
share/Makefile
-2
View File
@@ -13,7 +13,6 @@ SUBDIR= ${_colldef} \
${_examples} \
${_i18n} \
keys \
${_locale-links} \
${_man} \
${_me} \
misc \
@@ -61,7 +60,6 @@ _i18n= i18n
.if ${MK_LOCALES} != "no"
_colldef= colldef
_ctypedef= ctypedef
_locale-links= locale-links
_monetdef= monetdef
_msgdef= msgdef
_numericdef= numericdef
share/colldef/Makefile
+16 -16
View File
@@ -9,7 +9,7 @@ MAPLOC= ${.CURDIR}/../../tools/tools/locale/etc/final-maps
.src.LC_COLLATE:
localedef -D -U -i ${.IMPSRC} \
-f ${MAPLOC}/map.${.TARGET:T:R:E} ${.OBJDIR}/${.IMPSRC:T:R}
-f ${MAPLOC}/map.${.TARGET:T:R:E:C/@.*//} ${.OBJDIR}/${.IMPSRC:T:R}
LOCALES+= af_ZA.UTF-8
LOCALES+= am_ET.UTF-8
@@ -30,7 +30,7 @@ LOCALES+= hu_HU.UTF-8
LOCALES+= hy_AM.UTF-8
LOCALES+= is_IS.UTF-8
LOCALES+= ja_JP.UTF-8
LOCALES+= kk_Cyrl_KZ.UTF-8
LOCALES+= kk_KZ.UTF-8
LOCALES+= ko_KR.UTF-8
LOCALES+= lt_LT.UTF-8
LOCALES+= lv_LV.UTF-8
@@ -44,15 +44,15 @@ LOCALES+= sl_SI.UTF-8
LOCALES+= sv_SE.UTF-8
LOCALES+= tr_TR.UTF-8
LOCALES+= uk_UA.UTF-8
LOCALES+= zh_Hans_CN.UTF-8
LOCALES+= zh_Hant_TW.UTF-8
LOCALES+= zh_CN.UTF-8
LOCALES+= zh_TW.UTF-8
LOCALES_MAPPED+= af_ZA.UTF-8 af_ZA.ISO8859-15
LOCALES_MAPPED+= af_ZA.UTF-8 af_ZA.ISO8859-1
LOCALES_MAPPED+= be_BY.UTF-8 be_BY.ISO8859-5
LOCALES_MAPPED+= be_BY.UTF-8 be_BY.CP1251
LOCALES_MAPPED+= be_BY.UTF-8 be_BY.CP1131
LOCALES_MAPPED+= ru_RU.UTF-8 sr_Cyrl_RS.ISO8859-5
LOCALES_MAPPED+= ru_RU.UTF-8 sr_RS.ISO8859-5
LOCALES_MAPPED+= ru_RU.UTF-8 ru_RU.KOI8-R
LOCALES_MAPPED+= ru_RU.UTF-8 ru_RU.ISO8859-5
LOCALES_MAPPED+= ru_RU.UTF-8 ru_RU.CP866
@@ -66,7 +66,8 @@ LOCALES_MAPPED+= ca_AD.UTF-8 ca_ES.ISO8859-15
LOCALES_MAPPED+= ca_AD.UTF-8 ca_ES.ISO8859-1
LOCALES_MAPPED+= ca_AD.UTF-8 ca_AD.ISO8859-15
LOCALES_MAPPED+= ca_AD.UTF-8 ca_AD.ISO8859-1
LOCALES_MAPPED+= en_US.UTF-8 sr_Latn_RS.ISO8859-2
LOCALES_MAPPED+= en_US.UTF-8 sr_RS.UTF-8@latin
LOCALES_MAPPED+= en_US.UTF-8 sr_RS.ISO8859-2
LOCALES_MAPPED+= en_US.UTF-8 pt_PT.ISO8859-15
LOCALES_MAPPED+= en_US.UTF-8 pt_PT.ISO8859-1
LOCALES_MAPPED+= en_US.UTF-8 pt_BR.ISO8859-1
@@ -147,9 +148,9 @@ LOCALES_MAPPED+= tr_TR.UTF-8 tr_TR.ISO8859-9
LOCALES_MAPPED+= uk_UA.UTF-8 uk_UA.KOI8-U
LOCALES_MAPPED+= uk_UA.UTF-8 uk_UA.ISO8859-5
LOCALES_MAPPED+= uk_UA.UTF-8 uk_UA.CP1251
LOCALES_MAPPED+= zh_Hans_CN.UTF-8 zh_Hans_CN.GBK
LOCALES_MAPPED+= zh_Hans_CN.UTF-8 zh_Hans_CN.GB18030
LOCALES_MAPPED+= zh_Hant_TW.UTF-8 zh_Hant_TW.Big5
LOCALES_MAPPED+= zh_CN.UTF-8 zh_CN.GBK
LOCALES_MAPPED+= zh_CN.UTF-8 zh_CN.GB18030
LOCALES_MAPPED+= zh_TW.UTF-8 zh_TW.Big5
LOCALES+= cs_CZ.ISO8859-2
LOCALES+= da_DK.ISO8859-1
@@ -159,8 +160,8 @@ LOCALES+= hu_HU.ISO8859-2
LOCALES+= nb_NO.ISO8859-1
LOCALES+= nb_NO.ISO8859-15
LOCALES+= sk_SK.ISO8859-2
LOCALES+= zh_Hans_CN.GB2312
LOCALES+= zh_Hans_CN.eucCN
LOCALES+= zh_CN.GB2312
LOCALES+= zh_CN.eucCN
SAME+= ar_SA.UTF-8 ar_QA.UTF-8
@@ -168,13 +169,12 @@ 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+= ru_RU.UTF-8 sr_Cyrl_RS.UTF-8
SAME+= ru_RU.UTF-8 mn_Cyrl_MN.UTF-8
SAME+= ru_RU.UTF-8 sr_RS.UTF-8
SAME+= ru_RU.UTF-8 mn_MN.UTF-8
SAME+= ru_RU.UTF-8 bg_BG.UTF-8
SAME+= ca_AD.UTF-8 ca_IT.UTF-8
SAME+= ca_AD.UTF-8 ca_FR.UTF-8
SAME+= ca_AD.UTF-8 ca_ES.UTF-8
SAME+= en_US.UTF-8 sr_Latn_RS.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 nn_NO.UTF-8
@@ -204,7 +204,7 @@ SAME+= es_MX.UTF-8 es_CR.UTF-8
SAME+= es_MX.UTF-8 es_AR.UTF-8
SAME+= se_NO.UTF-8 se_FI.UTF-8
SAME+= sv_SE.UTF-8 sv_FI.UTF-8
SAME+= zh_Hant_TW.UTF-8 zh_Hant_HK.UTF-8
SAME+= zh_TW.UTF-8 zh_HK.UTF-8
SAME+= ko_KR.eucKR ko_KR.CP949 # legacy (same charset)
FILES= ${LOCALES:S/$/.LC_COLLATE/}
@@ -224,7 +224,7 @@ FILES+= $t.LC_COLLATE
FILESDIR_$t.LC_COLLATE= ${LOCALEDIR}/$t
$t.LC_COLLATE: ${.CURDIR}/$f.src
localedef -D -U -i ${.ALLSRC} \
-f ${MAPLOC}/map.${.TARGET:T:R:E} \
-f ${MAPLOC}/map.${.TARGET:T:R:E:C/@.*//} \
${.OBJDIR}/${.TARGET:T:R}
.endfor
share/colldef/kk_Cyrl_KZ.UTF-8.src → share/colldef/kk_KZ.UTF-8.src
View File
File renamed without changes.
share/colldef/zh_Hans_CN.UTF-8.src → share/colldef/zh_CN.UTF-8.src
View File
File renamed without changes.
share/colldef/zh_Hant_TW.UTF-8.src → share/colldef/zh_TW.UTF-8.src
View File
File renamed without changes.
share/ctypedef/Makefile
+26 -26
View File
@@ -30,29 +30,29 @@ LOCALES+= ru_RU.CP1251
LOCALES+= ru_RU.CP866
LOCALES+= ru_RU.ISO8859-5
LOCALES+= ru_RU.KOI8-R
LOCALES+= sr_Latn_RS.ISO8859-2
LOCALES+= sr_RS.ISO8859-2
LOCALES+= tr_TR.ISO8859-9
LOCALES+= uk_UA.CP1251
LOCALES+= uk_UA.ISO8859-5
LOCALES+= uk_UA.KOI8-U
LOCALES+= zh_Hans_CN.GB18030
LOCALES+= zh_Hans_CN.GB2312
LOCALES+= zh_Hans_CN.GBK
LOCALES+= zh_Hans_CN.eucCN
LOCALES+= zh_Hant_TW.Big5
LOCALES+= zh_CN.GB18030
LOCALES+= zh_CN.GB2312
LOCALES+= zh_CN.GBK
LOCALES+= zh_CN.eucCN
LOCALES+= zh_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 zh_TW.UTF-8
SAME+= en_US.UTF-8 zh_HK.UTF-8
SAME+= en_US.UTF-8 zh_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 sr_RS.UTF-8@latin
SAME+= en_US.UTF-8 sr_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
@@ -65,11 +65,11 @@ 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 mn_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 kk_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
@@ -184,7 +184,7 @@ 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 sr_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
@@ -192,13 +192,13 @@ 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+= sr_RS.ISO8859-2 sl_SI.ISO8859-2
SAME+= sr_RS.ISO8859-2 sk_SK.ISO8859-2
SAME+= sr_RS.ISO8859-2 ro_RO.ISO8859-2
SAME+= sr_RS.ISO8859-2 pl_PL.ISO8859-2
SAME+= sr_RS.ISO8859-2 hu_HU.ISO8859-2
SAME+= sr_RS.ISO8859-2 hr_HR.ISO8859-2
SAME+= sr_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
@@ -226,15 +226,15 @@ 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_CN.GB18030.src zh_CN.GB2312.src
SYMPAIRS+= zh_CN.GB18030.src zh_CN.GBK.src
SYMPAIRS+= zh_CN.GB18030.src zh_CN.eucCN.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 sr_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+= ja_JP.SJIS.src ja_JP.eucJP.src
.for s t in ${SYMPAIRS}
${t:S/src$/LC_CTYPE/}: $s
share/ctypedef/ja_JP.eucJP.src → share/ctypedef/ja_JP.SJIS.src
View File
File renamed without changes.
share/ctypedef/zh_Hans_CN.eucCN.src → share/ctypedef/zh_CN.GB18030.src
View File
File renamed without changes.
share/ctypedef/zh_Hant_TW.Big5.src → share/ctypedef/zh_TW.Big5.src
View File
File renamed without changes.
share/locale-links/Makefile
-22
View File
@@ -1,22 +0,0 @@
# $FreeBSD$
LOCALEDIR= ${SHAREDIR}/locale
LC_FILES= LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC \
LC_TIME
ALIASES= zh_Hans_CN.GB18030 zh_CN.GB18030 \
zh_Hans_CN.GB2312 zh_CN.GB2312 \
zh_Hans_CN.GBK zh_CN.GBK \
zh_Hans_CN.eucCN zh_CN.eucCN \
zh_Hans_CN.UTF-8 zh_CN.UTF-8 \
zh_Hant_HK.UTF-8 zh_HK.UTF-8 \
zh_Hant_TW.Big5 zh_TW.Big5 \
zh_Hant_TW.UTF-8 zh_TW.UTF-8
.for from to in ${ALIASES}
.for f in ${LC_FILES}
SYMLINKS+= ../${from}/${f} ${LOCALEDIR}/${to}/${f}
.endfor
.endfor
.include <bsd.prog.mk>
share/locale-links/Makefile.depend
-11
View File
@@ -1,11 +0,0 @@
# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
.include <dirdeps.mk>
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
.endif
share/monetdef/Makefile
+16 -16
View File
@@ -63,12 +63,12 @@ LOCALES+= it_CH.UTF-8
LOCALES+= ja_JP.SJIS
LOCALES+= ja_JP.UTF-8
LOCALES+= ja_JP.eucJP
LOCALES+= kk_Cyrl_KZ.UTF-8
LOCALES+= kk_KZ.UTF-8
LOCALES+= ko_KR.UTF-8
LOCALES+= ko_KR.eucKR
LOCALES+= lv_LV.ISO8859-13
LOCALES+= lv_LV.UTF-8
LOCALES+= mn_Cyrl_MN.UTF-8
LOCALES+= mn_MN.UTF-8
LOCALES+= nb_NO.ISO8859-15
LOCALES+= nb_NO.UTF-8
LOCALES+= nl_BE.ISO8859-15
@@ -89,7 +89,7 @@ LOCALES+= se_NO.UTF-8
LOCALES+= sk_SK.UTF-8
LOCALES+= sl_SI.ISO8859-2
LOCALES+= sl_SI.UTF-8
LOCALES+= sr_Latn_RS.UTF-8
LOCALES+= sr_RS.UTF-8@latin
LOCALES+= sv_FI.ISO8859-1
LOCALES+= sv_FI.ISO8859-15
LOCALES+= sv_FI.UTF-8
@@ -101,13 +101,13 @@ 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
LOCALES+= zh_CN.GB2312
LOCALES+= zh_CN.GBK
LOCALES+= zh_CN.UTF-8
LOCALES+= zh_CN.eucCN
LOCALES+= zh_HK.UTF-8
LOCALES+= zh_TW.Big5
LOCALES+= zh_TW.UTF-8
@@ -160,8 +160,8 @@ 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 en_HK.UTF-8
SAME+= zh_Hant_HK.UTF-8 en_HK.ISO8859-1
SAME+= zh_HK.UTF-8 en_HK.UTF-8
SAME+= zh_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
@@ -197,11 +197,11 @@ 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+= sr_RS.UTF-8@latin sr_RS.ISO8859-2
SAME+= sr_RS.UTF-8@latin sr_RS.UTF-8
SAME+= sr_RS.UTF-8@latin sr_RS.ISO8859-5
SAME+= sv_SE.ISO8859-15 sv_SE.ISO8859-1
SAME+= zh_Hans_CN.GBK zh_Hans_CN.GB18030
SAME+= zh_CN.GBK zh_CN.GB18030
SAME+= ko_KR.eucKR ko_KR.CP949 # legacy (same charset)
FILES= ${LOCALES:S/$/.out/}
share/monetdef/kk_Cyrl_KZ.UTF-8.src → share/monetdef/kk_KZ.UTF-8.src
View File
File renamed without changes.
share/monetdef/mn_Cyrl_MN.UTF-8.src → share/monetdef/mn_MN.UTF-8.src
View File
File renamed without changes.
share/monetdef/sr_Latn_RS.UTF-8.src → share/monetdef/[email protected]
View File
File renamed without changes.
share/monetdef/zh_Hans_CN.GB2312.src → share/monetdef/zh_CN.GB2312.src
View File
File renamed without changes.
share/monetdef/zh_Hans_CN.GBK.src → share/monetdef/zh_CN.GBK.src
View File
File renamed without changes.
share/monetdef/zh_Hans_CN.UTF-8.src → share/monetdef/zh_CN.UTF-8.src
View File
File renamed without changes.
share/monetdef/zh_Hans_CN.eucCN.src → share/monetdef/zh_CN.eucCN.src
View File
File renamed without changes.
share/monetdef/zh_Hant_HK.UTF-8.src → share/monetdef/zh_HK.UTF-8.src
View File
File renamed without changes.
share/monetdef/zh_Hant_TW.Big5.src → share/monetdef/zh_TW.Big5.src
View File
File renamed without changes.
share/monetdef/zh_Hant_TW.UTF-8.src → share/monetdef/zh_TW.UTF-8.src
View File
File renamed without changes.
share/msgdef/Makefile
+19 -19
View File
@@ -41,13 +41,13 @@ 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+= kk_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+= mn_MN.UTF-8
LOCALES+= nb_NO.UTF-8
LOCALES+= nl_NL.UTF-8
LOCALES+= nn_NO.UTF-8
@@ -63,9 +63,9 @@ LOCALES+= ru_RU.UTF-8
LOCALES+= se_NO.UTF-8
LOCALES+= sk_SK.ISO8859-2
LOCALES+= sk_SK.UTF-8
LOCALES+= sr_Cyrl_RS.ISO8859-5
LOCALES+= sr_Cyrl_RS.UTF-8
LOCALES+= sr_Latn_RS.UTF-8
LOCALES+= sr_RS.ISO8859-5
LOCALES+= sr_RS.UTF-8
LOCALES+= sr_RS.UTF-8@latin
LOCALES+= sv_SE.UTF-8
LOCALES+= tr_TR.ISO8859-9
LOCALES+= tr_TR.UTF-8
@@ -73,12 +73,12 @@ 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
LOCALES+= zh_CN.GB2312
LOCALES+= zh_CN.GBK
LOCALES+= zh_CN.UTF-8
LOCALES+= zh_HK.UTF-8
LOCALES+= zh_TW.Big5
LOCALES+= zh_TW.UTF-8
@@ -95,7 +95,7 @@ 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+= sr_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
@@ -178,11 +178,11 @@ 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+= 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+= sr_RS.UTF-8@latin sr_RS.ISO8859-2
SAME+= sr_RS.UTF-8@latin sl_SI.UTF-8
SAME+= sr_RS.UTF-8@latin sl_SI.ISO8859-2
SAME+= sr_RS.UTF-8@latin hr_HR.UTF-8
SAME+= sr_RS.UTF-8@latin 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
@@ -200,8 +200,8 @@ 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+= zh_Hans_CN.GBK zh_Hans_CN.GB18030
SAME+= zh_Hans_CN.GBK zh_Hans_CN.eucCN
SAME+= zh_CN.GBK zh_CN.GB18030
SAME+= zh_CN.GBK zh_CN.eucCN
SAME+= ko_KR.eucKR ko_KR.CP949 # legacy (same charset)
FILES= ${LOCALES:S/$/.out/}
share/msgdef/kk_Cyrl_KZ.UTF-8.src → share/msgdef/kk_KZ.UTF-8.src
View File
File renamed without changes.
share/msgdef/mn_Cyrl_MN.UTF-8.src → share/msgdef/mn_MN.UTF-8.src
View File
File renamed without changes.
share/msgdef/sr_Cyrl_RS.ISO8859-5.src → share/msgdef/sr_RS.ISO8859-5.src
View File
File renamed without changes.
share/msgdef/sr_Cyrl_RS.UTF-8.src → share/msgdef/sr_RS.UTF-8.src
View File
File renamed without changes.
share/msgdef/sr_Latn_RS.UTF-8.src → share/msgdef/[email protected]
View File
File renamed without changes.
share/msgdef/zh_Hans_CN.GB2312.src → share/msgdef/zh_CN.GB2312.src
View File
File renamed without changes.
share/msgdef/zh_Hans_CN.GBK.src → share/msgdef/zh_CN.GBK.src
View File
File renamed without changes.
share/msgdef/zh_Hans_CN.UTF-8.src → share/msgdef/zh_CN.UTF-8.src
View File
File renamed without changes.
share/msgdef/zh_Hant_HK.UTF-8.src → share/msgdef/zh_HK.UTF-8.src
View File
File renamed without changes.
share/msgdef/zh_Hant_TW.Big5.src → share/msgdef/zh_TW.Big5.src
View File
File renamed without changes.
share/msgdef/zh_Hant_TW.UTF-8.src → share/msgdef/zh_TW.UTF-8.src
View File
File renamed without changes.
share/numericdef/Makefile
+14 -14
View File
@@ -22,9 +22,9 @@ 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
LOCALES+= zh_CN.GB2312
LOCALES+= zh_CN.eucCN
LOCALES+= zh_TW.Big5
@@ -74,7 +74,7 @@ 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 kk_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
@@ -85,12 +85,12 @@ 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 zh_TW.UTF-8
SAME+= en_US.UTF-8 zh_HK.UTF-8
SAME+= en_US.UTF-8 zh_CN.UTF-8
SAME+= en_US.UTF-8 zh_CN.GBK
SAME+= en_US.UTF-8 zh_CN.GB18030
SAME+= en_US.UTF-8 mn_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
@@ -132,10 +132,10 @@ 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 sr_RS.UTF-8@latin
SAME+= tr_TR.UTF-8 sr_RS.ISO8859-2
SAME+= tr_TR.UTF-8 sr_RS.UTF-8
SAME+= tr_TR.UTF-8 sr_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
share/numericdef/zh_Hans_CN.GB2312.src → share/numericdef/zh_CN.GB2312.src
View File
File renamed without changes.
share/numericdef/zh_Hans_CN.eucCN.src → share/numericdef/zh_CN.eucCN.src
View File
File renamed without changes.
share/numericdef/zh_Hant_TW.Big5.src → share/numericdef/zh_TW.Big5.src
View File
File renamed without changes.
share/timedef/Makefile
+14 -14
View File
@@ -76,14 +76,14 @@ 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+= kk_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+= mn_MN.UTF-8
LOCALES+= nb_NO.ISO8859-15
LOCALES+= nb_NO.UTF-8
LOCALES+= nl_BE.UTF-8
@@ -109,10 +109,10 @@ 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+= sr_RS.ISO8859-5
LOCALES+= sr_RS.UTF-8
LOCALES+= sr_RS.ISO8859-2
LOCALES+= sr_RS.UTF-8@latin
LOCALES+= sv_FI.ISO8859-15
LOCALES+= sv_FI.UTF-8
LOCALES+= sv_SE.ISO8859-15
@@ -123,13 +123,13 @@ 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
LOCALES+= zh_CN.GB2312
LOCALES+= zh_CN.GBK
LOCALES+= zh_CN.UTF-8
LOCALES+= zh_CN.eucCN
LOCALES+= zh_HK.UTF-8
LOCALES+= zh_TW.Big5
LOCALES+= zh_TW.UTF-8
@@ -201,7 +201,7 @@ SAME+= nn_NO.ISO8859-15 nn_NO.ISO8859-1
SAME+= pt_PT.ISO8859-15 pt_PT.ISO8859-1
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+= zh_CN.GBK zh_CN.GB18030
SAME+= ko_KR.eucKR ko_KR.CP949 # legacy (same charset)
FILES= ${LOCALES:S/$/.out/}
share/timedef/kk_Cyrl_KZ.UTF-8.src → share/timedef/kk_KZ.UTF-8.src
View File
File renamed without changes.
share/timedef/mn_Cyrl_MN.UTF-8.src → share/timedef/mn_MN.UTF-8.src
View File
File renamed without changes.
share/timedef/sr_Latn_RS.ISO8859-2.src → share/timedef/sr_RS.ISO8859-2.src
View File
File renamed without changes.
share/timedef/sr_Cyrl_RS.ISO8859-5.src → share/timedef/sr_RS.ISO8859-5.src
View File
File renamed without changes.
share/timedef/sr_Cyrl_RS.UTF-8.src → share/timedef/sr_RS.UTF-8.src
View File
File renamed without changes.
share/timedef/sr_Latn_RS.UTF-8.src → share/timedef/[email protected]
View File
File renamed without changes.
share/timedef/zh_Hans_CN.GB2312.src → share/timedef/zh_CN.GB2312.src
View File
File renamed without changes.
share/timedef/zh_Hans_CN.GBK.src → share/timedef/zh_CN.GBK.src
View File
File renamed without changes.
share/timedef/zh_Hans_CN.UTF-8.src → share/timedef/zh_CN.UTF-8.src
View File
File renamed without changes.
share/timedef/zh_Hans_CN.eucCN.src → share/timedef/zh_CN.eucCN.src
View File
File renamed without changes.
share/timedef/zh_Hant_HK.UTF-8.src → share/timedef/zh_HK.UTF-8.src
View File
File renamed without changes.
share/timedef/zh_Hant_TW.Big5.src → share/timedef/zh_TW.Big5.src
View File
File renamed without changes.
share/timedef/zh_Hant_TW.UTF-8.src → share/timedef/zh_TW.UTF-8.src
View File
File renamed without changes.
tools/build/mk/OptionalObsoleteFiles.inc
+42 -84
View File
@@ -4796,6 +4796,12 @@ OLD_FILES+=usr/share/locale/en_ZA.ISO8859-1/LC_MESSAGES
OLD_FILES+=usr/share/locale/en_ZA.ISO8859-1/LC_MONETARY
OLD_FILES+=usr/share/locale/en_ZA.ISO8859-1/LC_NUMERIC
OLD_FILES+=usr/share/locale/en_ZA.ISO8859-1/LC_TIME
OLD_FILES+=usr/share/locale/en_ZA.ISO8859-15/LC_COLLATE
OLD_FILES+=usr/share/locale/en_ZA.ISO8859-15/LC_CTYPE
OLD_FILES+=usr/share/locale/en_ZA.ISO8859-15/LC_MESSAGES
OLD_FILES+=usr/share/locale/en_ZA.ISO8859-15/LC_MONETARY
OLD_FILES+=usr/share/locale/en_ZA.ISO8859-15/LC_NUMERIC
OLD_FILES+=usr/share/locale/en_ZA.ISO8859-15/LC_TIME
OLD_FILES+=usr/share/locale/en_ZA.US-ASCII/LC_COLLATE
OLD_FILES+=usr/share/locale/en_ZA.US-ASCII/LC_CTYPE
OLD_FILES+=usr/share/locale/en_ZA.US-ASCII/LC_MESSAGES
@@ -5108,12 +5114,12 @@ OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_MESSAGES
OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_MONETARY
OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_NUMERIC
OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_TIME
OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_COLLATE
OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_CTYPE
OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_MESSAGES
OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_MONETARY
OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_NUMERIC
OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_TIME
OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_COLLATE
OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_CTYPE
OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_MESSAGES
OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_MONETARY
OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_NUMERIC
OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_TIME
OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_COLLATE
OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_CTYPE
OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_MESSAGES
@@ -5156,12 +5162,12 @@ OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_MESSAGES
OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_MONETARY
OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_NUMERIC
OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_TIME
OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_COLLATE
OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_CTYPE
OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_MESSAGES
OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_MONETARY
OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_NUMERIC
OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_TIME
OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_COLLATE
OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_CTYPE
OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_MESSAGES
OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_MONETARY
OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_NUMERIC
OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_TIME
OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_COLLATE
OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_CTYPE
OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_MESSAGES
@@ -5354,30 +5360,30 @@ OLD_FILES+=usr/share/locale/sl_SI.UTF-8/LC_MESSAGES
OLD_FILES+=usr/share/locale/sl_SI.UTF-8/LC_MONETARY
OLD_FILES+=usr/share/locale/sl_SI.UTF-8/LC_NUMERIC
OLD_FILES+=usr/share/locale/sl_SI.UTF-8/LC_TIME
OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_COLLATE
OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_CTYPE
OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_MESSAGES
OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_MONETARY
OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_NUMERIC
OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_TIME
OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_COLLATE
OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_CTYPE
OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_MESSAGES
OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_MONETARY
OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_NUMERIC
OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_TIME
OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_COLLATE
OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_CTYPE
OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_MESSAGES
OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_MONETARY
OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_NUMERIC
OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_TIME
OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_COLLATE
OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_CTYPE
OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_MESSAGES
OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_MONETARY
OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_NUMERIC
OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_TIME
OLD_FILES+=usr/share/locale/sr_RS.ISO8859-5/LC_COLLATE
OLD_FILES+=usr/share/locale/sr_RS.ISO8859-5/LC_CTYPE
OLD_FILES+=usr/share/locale/sr_RS.ISO8859-5/LC_MESSAGES
OLD_FILES+=usr/share/locale/sr_RS.ISO8859-5/LC_MONETARY
OLD_FILES+=usr/share/locale/sr_RS.ISO8859-5/LC_NUMERIC
OLD_FILES+=usr/share/locale/sr_RS.ISO8859-5/LC_TIME
OLD_FILES+=usr/share/locale/sr_RS.UTF-8/LC_COLLATE
OLD_FILES+=usr/share/locale/sr_RS.UTF-8/LC_CTYPE
OLD_FILES+=usr/share/locale/sr_RS.UTF-8/LC_MESSAGES
OLD_FILES+=usr/share/locale/sr_RS.UTF-8/LC_MONETARY
OLD_FILES+=usr/share/locale/sr_RS.UTF-8/LC_NUMERIC
OLD_FILES+=usr/share/locale/sr_RS.UTF-8/LC_TIME
OLD_FILES+=usr/share/locale/sr_RS.ISO8859-2/LC_COLLATE
OLD_FILES+=usr/share/locale/sr_RS.ISO8859-2/LC_CTYPE
OLD_FILES+=usr/share/locale/sr_RS.ISO8859-2/LC_MESSAGES
OLD_FILES+=usr/share/locale/sr_RS.ISO8859-2/LC_MONETARY
OLD_FILES+=usr/share/locale/sr_RS.ISO8859-2/LC_NUMERIC
OLD_FILES+=usr/share/locale/sr_RS.ISO8859-2/LC_TIME
OLD_FILES+=usr/share/locale/sr_RS.UTF-8@latin/LC_COLLATE
OLD_FILES+=usr/share/locale/sr_RS.UTF-8@latin/LC_CTYPE
OLD_FILES+=usr/share/locale/sr_RS.UTF-8@latin/LC_MESSAGES
OLD_FILES+=usr/share/locale/sr_RS.UTF-8@latin/LC_MONETARY
OLD_FILES+=usr/share/locale/sr_RS.UTF-8@latin/LC_NUMERIC
OLD_FILES+=usr/share/locale/sr_RS.UTF-8@latin/LC_TIME
OLD_FILES+=usr/share/locale/sv_FI.ISO8859-1/LC_COLLATE
OLD_FILES+=usr/share/locale/sv_FI.ISO8859-1/LC_CTYPE
OLD_FILES+=usr/share/locale/sv_FI.ISO8859-1/LC_MESSAGES
@@ -5480,54 +5486,6 @@ OLD_FILES+=usr/share/locale/zh_CN.UTF-8/LC_MESSAGES
OLD_FILES+=usr/share/locale/zh_CN.UTF-8/LC_MONETARY
OLD_FILES+=usr/share/locale/zh_CN.UTF-8/LC_NUMERIC
OLD_FILES+=usr/share/locale/zh_CN.UTF-8/LC_TIME
OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_COLLATE
OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_CTYPE
OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_MESSAGES
OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_MONETARY
OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_NUMERIC
OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_TIME
OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_COLLATE
OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_CTYPE
OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_MESSAGES
OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_MONETARY
OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_NUMERIC
OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_TIME
OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_COLLATE
OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_CTYPE
OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_MESSAGES
OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_MONETARY
OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_NUMERIC
OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_TIME
OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_COLLATE
OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_CTYPE
OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_MESSAGES
OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_MONETARY
OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_NUMERIC
OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_TIME
OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_COLLATE
OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_CTYPE
OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_MESSAGES
OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_MONETARY
OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_NUMERIC
OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_TIME
OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_COLLATE
OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_CTYPE
OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_MESSAGES
OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_MONETARY
OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_NUMERIC
OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_TIME
OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_COLLATE
OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_CTYPE
OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_MESSAGES
OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_MONETARY
OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_NUMERIC
OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_TIME
OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_COLLATE
OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_CTYPE
OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_MESSAGES
OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_MONETARY
OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_NUMERIC
OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_TIME
OLD_FILES+=usr/share/locale/zh_HK.UTF-8/LC_COLLATE
OLD_FILES+=usr/share/locale/zh_HK.UTF-8/LC_CTYPE
OLD_FILES+=usr/share/locale/zh_HK.UTF-8/LC_MESSAGES
tools/tools/locale/tools/cldr2def.pl
+2 -2
View File
@@ -848,7 +848,7 @@ sub make_makefile {
my $MAPLOC;
if ($TYPE eq "colldef") {
$SRCOUT = "localedef -D -U -i \${.IMPSRC} \\\n" .
"\t-f \${MAPLOC}/map.\${.TARGET:T:R:E} " .
"\t-f \${MAPLOC}/map.\${.TARGET:T:R:E:C/@.*//} " .
"\${.OBJDIR}/\${.IMPSRC:T:R}";
$MAPLOC = "MAPLOC=\t\t\${.CURDIR}/../../tools/tools/" .
"locale/etc/final-maps\n";
@@ -859,7 +859,7 @@ sub make_makefile {
"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-f \${MAPLOC}/map.\${.TARGET:T:R:E:C/@.*//} \\\n" .
"\t\t\${.OBJDIR}/\${.TARGET:T:R}\n" .
".endfor\n\n";
$SRCOUT4 = "## LOCALES_MAPPED\n";
tools/tools/locale/tools/finalize
+55 -2
View File
@@ -8,6 +8,8 @@
# the generate makefile to pull the LOCALES first.
#
set -e
usage ()
{
echo "finalize <type>' to package standard localization"
@@ -37,6 +39,56 @@ AWKCMD="/## PLACEHOLDER/ { \
while ( getline line < \"${TEMP4}\" ) {print line} } \
!/## / { print \$0 }"
# Rename the sources with 3 components name into the POSIX version of the name using @modifier
cd $old
for i in *_*_*.*.src; do
oldname=${i%.*}
nname=`echo $oldname | awk '{ split($0, a, "_"); print a[1]"_"a[3]"@"a[2];} '`
mv -i ${oldname}.src ${nname}.src
done
sed -i '' -Ee "s/([a-zA-Z]{2})_([a-zA-Z]+)_([a-zA-Z]{2}).([a-zA-Z0-9-]+)/\1_\3.\4@\2/g" ${old}/Makefile
# For variable without @modifier ambiguity do not keep the @modifier
for i in *@*.src; do
oldname=${i%.*}
shortname=${oldname%@*}
if [ $(ls ${shortname}@* | wc -l) -eq 1 -a ! -f ${shortname}.src ] ; then
mv -i $i ${shortname}.src
sed -i '' -e "s/${oldname}/${shortname}/g" ${old}/Makefile
fi
done
# Rename the modifiers into non abbreviated version
for i in *@Latn.src; do
if [ "$i" = "*@Latn.src" ]; then
break
fi
mv ${i} ${i%@*}@latin.src
done
sed -i '' -e "s/@Latn/@latin/g" ${old}/Makefile
for i in *@Cyrl.src; do
if [ "$i" = "*@Cyrl.src" ]; then
break
fi
mv ${i} ${i%@*}@cyrillic.src
done
sed -i '' -e "s/@Cyrl/@cyrillic/g" ${old}/Makefile
# On locales with multiple modifiers rename the "default" version without the @modifier
default_locales="sr_RS@cyrillic"
for i in ${default_locales}; do
localename=${i%@*}
mod=${i#*@}
for l in ${localename}.*@${mod}.src; do
if [ "$l" = "${localename}.*@${mod}.src" ]; then
break
fi
mv ${l} ${l%@*}.src
sed -i '' -e "s/${l%.*}/${l%@*}/g" ${old}/Makefile
done
done
cd -
grep '^LOCALES+' ${old}/Makefile > ${TEMP}
if [ $1 = "ctypedef" ]
@@ -94,8 +146,9 @@ then
done
echo "" >> ${TEMP4}
for enc in ${COLLATIONS_SPECIAL}; do
sed -i '' "/^.*${enc}$/d" ${TEMP4}
echo "LOCALES+= ${enc}" >> ${TEMP4}
nname=`echo $enc | sed -e 's/_Hans//g'`
sed -i '' "/^.*${nname}$/d" ${TEMP4}
echo "LOCALES+= ${nname}" >> ${TEMP4}
done
keep=$(cat ${TEMP} | awk '{ print $2 }')