svn commit: r290859 - in head: . etc/mtree share/locale-links
Baptiste Daroussin
bapt at FreeBSD.org
Sun Nov 15 12:44:32 UTC 2015
Author: bapt
Date: Sun Nov 15 12:44:31 2015
New Revision: 290859
URL: https://svnweb.freebsd.org/changeset/base/290859
Log:
Rework locale-links to not make symlinks on directories but symlinks on files
The goal here is to make the upgrade seamless for users
Add aliases for zh_HK
Remove bad symlinks created by previous bad upgrade procedure.
Complete ObsoleteFiles.inc with more locales that have been removed
Modified:
head/ObsoleteFiles.inc
head/etc/mtree/BSD.usr.dist
head/share/locale-links/Makefile
Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc Sun Nov 15 12:16:08 2015 (r290858)
+++ head/ObsoleteFiles.inc Sun Nov 15 12:44:31 2015 (r290859)
@@ -38,9 +38,185 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20151115: Fox bad upgrade scheme
+OLD_FILES+=usr/share/locale/zh_CN.GB18030/zh_Hans_CN.GB18030
+OLD_FILES+=usr/share/locale/zh_CN.GB2312/zh_Hans_CN.GB2312
+OLD_FILES+=usr/share/locale/zh_CN.GBK/zh_Hans_CN.GBK
+OLD_FILES+=usr/share/locale/zh_CN.UTF-8/zh_Hans_CN.UTF-8
+OLD_FILES+=usr/share/locale/zh_CN.eucCN/zh_Hans_CN.eucCN
+OLD_FILES+=usr/share/locale/zh_TW.Big5/zh_Hant_TW.Big5
+OLD_FILES+=usr/share/locale/zh_TW.UTF-8/zh_Hant_TW.UTF-8
# 20151107: String collation improvements
OLD_FILES+=usr/share/locale/UTF-8/LC_CTYPE
OLD_DIRS+=usr/share/locale/UTF-8
+OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_CTYPE
+OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_MONETARY
+OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_NUMERIC
+OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_MESSAGES
+OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_COLLATE
+OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_TIME
+OLD_DIRS+=usr/share/locale/af_ZA.ISO8859-15
+OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_NUMERIC
+OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_CTYPE
+OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_MONETARY
+OLD_DIRS+=usr/share/locale/ca_AD.ISO8859-1
+OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_MONETARY
+OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_NUMERIC
+OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_CTYPE
+OLD_DIRS+=usr/share/locale/ca_FR.ISO8859-1
+OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_MONETARY
+OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_CTYPE
+OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_NUMERIC
+OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_TIME
+OLD_DIRS+=usr/share/locale/ca_ES.ISO8859-1
+OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_MONETARY
+OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_NUMERIC
+OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_CTYPE
+OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_COLLATE
+OLD_DIRS+=usr/share/locale/ca_IT.ISO8859-1
+OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_NUMERIC
+OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_MONETARY
+OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_CTYPE
+OLD_DIRS+=usr/share/locale/da_DK.ISO8859-1
+OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_MONETARY
+OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_CTYPE
+OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_NUMERIC
+OLD_DIRS+=usr/share/locale/de_AT.ISO8859-1
+OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_MONETARY
+OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_CTYPE
+OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_NUMERIC
+OLD_DIRS+=usr/share/locale/de_CH.ISO8859-1
+OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_MONETARY
+OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_CTYPE
+OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_NUMERIC
+OLD_DIRS+=usr/share/locale/de_DE.ISO8859-1
+OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_NUMERIC
+OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_MESSAGES
+OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_TIME
+OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_CTYPE
+OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_COLLATE
+OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_MONETARY
+OLD_DIRS+=usr/share/locale/en_CA.ISO8859-15
+OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_COLLATE
+OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_CTYPE
+OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_MESSAGES
+OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_TIME
+OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_NUMERIC
+OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_MONETARY
+OLD_DIRS+=usr/share/locale/en_AU.ISO8859-15
+OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_CTYPE
+OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_NUMERIC
+OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_MONETARY
+OLD_DIRS+=usr/share/locale/en_GB.ISO8859-1
+OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_CTYPE
+OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_MESSAGES
+OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_COLLATE
+OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_TIME
+OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_MONETARY
+OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_NUMERIC
+OLD_DIRS+=usr/share/locale/en_US.ISO8859-15
+OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_MONETARY
+OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_CTYPE
+OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_NUMERIC
+OLD_DIRS+=usr/share/locale/es_ES.ISO8859-1
+OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_CTYPE
+OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_NUMERIC
+OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_MONETARY
+OLD_DIRS+=usr/share/locale/eu_ES.ISO8859-1
+OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_MESSAGES
+OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_COLLATE
+OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_TIME
+OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_MONETARY
+OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_NUMERIC
+OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_CTYPE
+OLD_DIRS+=usr/share/locale/en_NZ.ISO8859-15
+OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_CTYPE
+OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_NUMERIC
+OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_MONETARY
+OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_MESSAGES
+OLD_DIRS+=usr/share/locale/fi_FI.ISO8859-1
+OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_CTYPE
+OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_MONETARY
+OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_NUMERIC
+OLD_DIRS+=usr/share/locale/fr_BE.ISO8859-1
+OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_COLLATE
+OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_MESSAGES
+OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_CTYPE
+OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_TIME
+OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_NUMERIC
+OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_MONETARY
+OLD_DIRS+=usr/share/locale/fr_CA.ISO8859-15
+OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_NUMERIC
+OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_CTYPE
+OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_MONETARY
+OLD_DIRS+=usr/share/locale/fr_CH.ISO8859-1
+OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_MONETARY
+OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_NUMERIC
+OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_CTYPE
+OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_COLLATE
+OLD_DIRS+=usr/share/locale/fr_FR.ISO8859-1
+OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_MONETARY
+OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_CTYPE
+OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_NUMERIC
+OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_TIME
+OLD_DIRS+=usr/share/locale/it_CH.ISO8859-1
+OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_MONETARY
+OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_CTYPE
+OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_NUMERIC
+OLD_DIRS+=usr/share/locale/is_IS.ISO8859-1
+OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_CTYPE
+OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_NUMERIC
+OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_MONETARY
+OLD_DIRS+=usr/share/locale/it_IT.ISO8859-1
OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_COLLATE
OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_CTYPE
OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_MESSAGES
@@ -78,6 +254,13 @@ OLD_FILES+=usr/share/locale/la_LN.US-ASC
OLD_FILES+=usr/share/locale/la_LN.US-ASCII/LC_CTYPE
OLD_FILES+=usr/share/locale/la_LN.US-ASCII/LC_TIME
OLD_DIRS+=usr/share/locale/la_LN.US-ASCII
+OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_MESSAGES
+OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_TIME
+OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_COLLATE
+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
@@ -85,6 +268,34 @@ OLD_FILES+=usr/share/locale/mn_MN.UTF-8/
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/nb_NO.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_NUMERIC
+OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_MONETARY
+OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_CTYPE
+OLD_DIRS+=usr/share/locale/nb_NO.ISO8859-1
+OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_MONETARY
+OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_NUMERIC
+OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_CTYPE
+OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_COLLATE
+OLD_DIRS+=usr/share/locale/nl_BE.ISO8859-1
+OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_MONETARY
+OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_NUMERIC
+OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_CTYPE
+OLD_DIRS+=usr/share/locale/nl_NL.ISO8859-1
+OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_CTYPE
+OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_MONETARY
+OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_NUMERIC
+OLD_DIRS+=usr/share/locale/nn_NO.ISO8859-1
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
@@ -106,6 +317,41 @@ OLD_FILES+=usr/share/locale/no_NO.UTF-8/
OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_NUMERIC
OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_TIME
OLD_DIRS+=usr/share/locale/no_NO.UTF-8
+OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_NUMERIC
+OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_MONETARY
+OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_CTYPE
+OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_COLLATE
+OLD_DIRS+=usr/share/locale/pt_PT.ISO8859-1
+OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_COLLATE
+OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_TIME
+OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_CTYPE
+OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_MESSAGES
+OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_NUMERIC
+OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_MONETARY
+OLD_DIRS+=usr/share/locale/sr_YU.ISO8859-2
+OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_COLLATE
+OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_MONETARY
+OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_NUMERIC
+OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_CTYPE
+OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_TIME
+OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_MESSAGES
+OLD_DIRS+=usr/share/locale/sr_YU.ISO8859-5
+OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_COLLATE
+OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_MONETARY
+OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_CTYPE
+OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_TIME
+OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_NUMERIC
+OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_MESSAGES
+OLD_DIRS+=usr/share/locale/sr_YU.UTF-8
+OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_MONETARY
+OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_NUMERIC
+OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_CTYPE
+OLD_DIRS+=usr/share/locale/sv_SE.ISO8859-1
OLD_FILES+=usr/bin/colldef
OLD_FILES+=usr/share/man/man1/colldef.1.gz
OLD_FILES+=usr/bin/mklocale
Modified: head/etc/mtree/BSD.usr.dist
==============================================================================
--- head/etc/mtree/BSD.usr.dist Sun Nov 15 12:16:08 2015 (r290858)
+++ head/etc/mtree/BSD.usr.dist Sun Nov 15 12:44:31 2015 (r290859)
@@ -811,6 +811,16 @@
..
uk_UA.UTF-8
..
+ zh_CN.GB18030
+ ..
+ zh_CN.GB2312
+ ..
+ zh_CN.GBK
+ ..
+ zh_CN.eucCN
+ ..
+ zh_CN.UTF-8
+ ..
zh_Hans_CN.GB18030
..
zh_Hans_CN.GB2312
@@ -829,6 +839,14 @@
..
zh_Hant_TW.UTF-8
..
+ zh_HK.Big5HKSCS
+ ..
+ zh_HK.UTF-8
+ ..
+ zh_TW.Big5
+ ..
+ zh_TW.UTF-8
+ ..
..
man
/set uname=man
Modified: head/share/locale-links/Makefile
==============================================================================
--- head/share/locale-links/Makefile Sun Nov 15 12:16:08 2015 (r290858)
+++ head/share/locale-links/Makefile Sun Nov 15 12:44:31 2015 (r290859)
@@ -1,16 +1,28 @@
# $FreeBSD$
LOCALEDIR= ${SHAREDIR}/locale
+LC_FILES= LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC \
+ LC_TIME
# We need to keep zh_CN.* around as aliases to zh_Hans_CN.* because some
# of the lang catalogs use zh_CN still (e.g. vi), plus people may expect it
# We won't alias zh_Hans_CN or zh_Hans_UTF8 though
.for CN in GB18030 GB2312 GBK UTF-8 eucCN
-SYMLINKS+= zh_Hans_CN.${CN} ${LOCALEDIR}/zh_CN.${CN}
+.for f in ${LC_FILES}
+SYMLINKS+= zh_Hans_CN.${CN}/${f} ${LOCALEDIR}/zh_CN.${CN}/${f}
+.endfor
+.endfor
+
+.for HK in Big5HKSCS UTF-8
+.for f in ${LC_FILES}
+SYMLINKS+= zh_Hant_HK.${HK}/${f} ${LOCALEDIR}/zh_HK.${HK}/${f}
+.endfor
.endfor
.for TW in Big5 UTF-8
-SYMLINKS+= zh_Hant_TW.${TW} ${LOCALEDIR}/zh_TW.${TW}
+.for f in ${LC_FILES}
+SYMLINKS+= zh_Hant_TW.${TW}/${f} ${LOCALEDIR}/zh_TW.${TW}/${f}
+.endfor
.endfor
.include <bsd.prog.mk>
More information about the svn-src-head
mailing list