Update the list of files to be removed in case world is built WITHOUT_LOCALES

1 files changed, 126 insertions, 101 deletions

diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 00001cd..21026a7 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -4247,12 +4247,6 @@ OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_COLLATE
-OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_CTYPE
-OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_MESSAGES
-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_TIME
 OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_MESSAGES
@@ -4265,6 +4259,42 @@ OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_TIME
+OLD_FILES+=usr/share/locale/ar_AE.UTF-8/LC_COLLATE
+OLD_FILES+=usr/share/locale/ar_AE.UTF-8/LC_CTYPE
+OLD_FILES+=usr/share/locale/ar_AE.UTF-8/LC_MESSAGES
+OLD_FILES+=usr/share/locale/ar_AE.UTF-8/LC_MONETARY
+OLD_FILES+=usr/share/locale/ar_AE.UTF-8/LC_NUMERIC
+OLD_FILES+=usr/share/locale/ar_AE.UTF-8/LC_TIME
+OLD_FILES+=usr/share/locale/ar_EG.UTF-8/LC_COLLATE
+OLD_FILES+=usr/share/locale/ar_EG.UTF-8/LC_CTYPE
+OLD_FILES+=usr/share/locale/ar_EG.UTF-8/LC_MESSAGES
+OLD_FILES+=usr/share/locale/ar_EG.UTF-8/LC_MONETARY
+OLD_FILES+=usr/share/locale/ar_EG.UTF-8/LC_NUMERIC
+OLD_FILES+=usr/share/locale/ar_EG.UTF-8/LC_TIME
+OLD_FILES+=usr/share/locale/ar_JO.UTF-8/LC_COLLATE
+OLD_FILES+=usr/share/locale/ar_JO.UTF-8/LC_CTYPE
+OLD_FILES+=usr/share/locale/ar_JO.UTF-8/LC_MESSAGES
+OLD_FILES+=usr/share/locale/ar_JO.UTF-8/LC_MONETARY
+OLD_FILES+=usr/share/locale/ar_JO.UTF-8/LC_NUMERIC
+OLD_FILES+=usr/share/locale/ar_JO.UTF-8/LC_TIME
+OLD_FILES+=usr/share/locale/ar_MA.UTF-8/LC_COLLATE
+OLD_FILES+=usr/share/locale/ar_MA.UTF-8/LC_CTYPE
+OLD_FILES+=usr/share/locale/ar_MA.UTF-8/LC_MESSAGES
+OLD_FILES+=usr/share/locale/ar_MA.UTF-8/LC_MONETARY
+OLD_FILES+=usr/share/locale/ar_MA.UTF-8/LC_NUMERIC
+OLD_FILES+=usr/share/locale/ar_MA.UTF-8/LC_TIME
+OLD_FILES+=usr/share/locale/ar_QA.UTF-8/LC_COLLATE
+OLD_FILES+=usr/share/locale/ar_QA.UTF-8/LC_CTYPE
+OLD_FILES+=usr/share/locale/ar_QA.UTF-8/LC_MESSAGES
+OLD_FILES+=usr/share/locale/ar_QA.UTF-8/LC_MONETARY
+OLD_FILES+=usr/share/locale/ar_QA.UTF-8/LC_NUMERIC
+OLD_FILES+=usr/share/locale/ar_QA.UTF-8/LC_TIME
+OLD_FILES+=usr/share/locale/ar_SA.UTF-8/LC_COLLATE
+OLD_FILES+=usr/share/locale/ar_SA.UTF-8/LC_CTYPE
+OLD_FILES+=usr/share/locale/ar_SA.UTF-8/LC_MESSAGES
+OLD_FILES+=usr/share/locale/ar_SA.UTF-8/LC_MONETARY
+OLD_FILES+=usr/share/locale/ar_SA.UTF-8/LC_NUMERIC
+OLD_FILES+=usr/share/locale/ar_SA.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_COLLATE
 OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_CTYPE
 OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_MESSAGES
@@ -4475,12 +4505,6 @@ OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_TIME
-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_MONETARY
-OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_NUMERIC
-OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_MESSAGES
@@ -4499,12 +4523,6 @@ OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_COLLATE
-OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_CTYPE
-OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_MESSAGES
-OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_MONETARY
-OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_NUMERIC
-OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_MESSAGES
@@ -4553,6 +4571,18 @@ OLD_FILES+=usr/share/locale/en_HK.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_HK.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_HK.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_HK.UTF-8/LC_TIME
+OLD_FILES+=usr/share/locale/en_IE.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/en_IE.ISO8859-1/LC_CTYPE
+OLD_FILES+=usr/share/locale/en_IE.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/en_IE.ISO8859-1/LC_MONETARY
+OLD_FILES+=usr/share/locale/en_IE.ISO8859-1/LC_NUMERIC
+OLD_FILES+=usr/share/locale/en_IE.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/en_IE.ISO8859-15/LC_COLLATE
+OLD_FILES+=usr/share/locale/en_IE.ISO8859-15/LC_CTYPE
+OLD_FILES+=usr/share/locale/en_IE.ISO8859-15/LC_MESSAGES
+OLD_FILES+=usr/share/locale/en_IE.ISO8859-15/LC_MONETARY
+OLD_FILES+=usr/share/locale/en_IE.ISO8859-15/LC_NUMERIC
+OLD_FILES+=usr/share/locale/en_IE.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_MESSAGES
@@ -4565,12 +4595,6 @@ OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_COLLATE
-OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_CTYPE
-OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_MESSAGES
-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_TIME
 OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_MESSAGES
@@ -4583,12 +4607,6 @@ OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_TIME
-OLD_FILES+=usr/share/locale/en_PH.ISO8859-1/LC_COLLATE
-OLD_FILES+=usr/share/locale/en_PH.ISO8859-1/LC_CTYPE
-OLD_FILES+=usr/share/locale/en_PH.ISO8859-1/LC_MESSAGES
-OLD_FILES+=usr/share/locale/en_PH.ISO8859-1/LC_MONETARY
-OLD_FILES+=usr/share/locale/en_PH.ISO8859-1/LC_NUMERIC
-OLD_FILES+=usr/share/locale/en_PH.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/en_PH.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_PH.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_PH.UTF-8/LC_MESSAGES
@@ -4607,20 +4625,12 @@ OLD_FILES+=usr/share/locale/en_SG.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_SG.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_SG.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_SG.UTF-8/LC_TIME
-OLD_FILES+=usr/share/locale/en_US.ISO-8859-1
-OLD_FILES+=usr/share/locale/en_US.ISO-8859-15
 OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_COLLATE
-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_MONETARY
-OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_NUMERIC
-OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_MESSAGES
@@ -4639,12 +4649,6 @@ 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
@@ -4669,12 +4673,6 @@ OLD_FILES+=usr/share/locale/es_AR.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/es_AR.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/es_AR.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/es_AR.UTF-8/LC_TIME
-OLD_FILES+=usr/share/locale/es_CR.ISO8859-1/LC_COLLATE
-OLD_FILES+=usr/share/locale/es_CR.ISO8859-1/LC_CTYPE
-OLD_FILES+=usr/share/locale/es_CR.ISO8859-1/LC_MESSAGES
-OLD_FILES+=usr/share/locale/es_CR.ISO8859-1/LC_MONETARY
-OLD_FILES+=usr/share/locale/es_CR.ISO8859-1/LC_NUMERIC
-OLD_FILES+=usr/share/locale/es_CR.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/es_CR.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/es_CR.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/es_CR.UTF-8/LC_MESSAGES
@@ -4711,6 +4709,12 @@ OLD_FILES+=usr/share/locale/es_MX.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/es_MX.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/es_MX.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/es_MX.UTF-8/LC_TIME
+OLD_FILES+=usr/share/locale/et_EE.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/et_EE.ISO8859-1/LC_CTYPE
+OLD_FILES+=usr/share/locale/et_EE.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/et_EE.ISO8859-1/LC_MONETARY
+OLD_FILES+=usr/share/locale/et_EE.ISO8859-1/LC_NUMERIC
+OLD_FILES+=usr/share/locale/et_EE.ISO8859-1/LC_TIME
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_MESSAGES
@@ -4777,30 +4781,18 @@ OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_TIME
-OLD_FILES+=usr/share/locale/fr_BE.UTF8
-OLD_FILES+=usr/share/locale/fr_CA
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_COLLATE
-OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_CTYPE
-OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_MESSAGES
-OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_MONETARY
-OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_NUMERIC
-OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_TIME
-OLD_FILES+=usr/share/locale/fr_CA.UTF8
-OLD_FILES+=usr/share/locale/fr_CA@euro
-OLD_FILES+=usr/share/locale/fr_CH
-OLD_FILES+=usr/share/locale/fr_CH.ISO-8859-15@euro
 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_MESSAGES
@@ -4945,6 +4937,12 @@ OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_TIME
+OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_COLLATE
+OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_CTYPE
+OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_MESSAGES
+OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_MONETARY
+OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_NUMERIC
+OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_TIME
 OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_COLLATE
 OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_CTYPE
 OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_MESSAGES
@@ -4957,12 +4955,6 @@ 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/ja_JP.eucJP/LC_COLLATE
-OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_CTYPE
-OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_MESSAGES
-OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_MONETARY
-OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_NUMERIC
-OLD_FILES+=usr/share/locale/ja_JP.eucJP/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
@@ -4975,30 +4967,24 @@ OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_MONETARY
 OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_TIME
-OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_COLLATE
-OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_CTYPE
-OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_MESSAGES
-OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_MONETARY
-OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_NUMERIC
-OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_COLLATE
 OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_CTYPE
 OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_MONETARY
 OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_TIME
+OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_COLLATE
+OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_CTYPE
+OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_MESSAGES
+OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_MONETARY
+OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_NUMERIC
+OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_COLLATE
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_CTYPE
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_MESSAGES
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_MONETARY
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_NUMERIC
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_TIME
-OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_COLLATE
-OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_CTYPE
-OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_MESSAGES
-OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_MONETARY
-OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_NUMERIC
-OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_TIME
 OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_MESSAGES
@@ -5113,12 +5099,6 @@ OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/pt_BR.ISO8859-15/LC_COLLATE
-OLD_FILES+=usr/share/locale/pt_BR.ISO8859-15/LC_CTYPE
-OLD_FILES+=usr/share/locale/pt_BR.ISO8859-15/LC_MESSAGES
-OLD_FILES+=usr/share/locale/pt_BR.ISO8859-15/LC_MONETARY
-OLD_FILES+=usr/share/locale/pt_BR.ISO8859-15/LC_NUMERIC
-OLD_FILES+=usr/share/locale/pt_BR.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_MESSAGES
@@ -5317,13 +5297,42 @@ OLD_FILES+=usr/share/locale/uk_UA.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/uk_UA.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/uk_UA.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/uk_UA.UTF-8/LC_TIME
-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_HK.Big5HKSCS
-OLD_FILES+=usr/share/locale/zh_HK.UTF-8
+OLD_FILES+=usr/share/locale/zh_CN.eucCN/LC_COLLATE
+OLD_FILES+=usr/share/locale/zh_CN.eucCN/LC_CTYPE
+OLD_FILES+=usr/share/locale/zh_CN.eucCN/LC_MESSAGES
+OLD_FILES+=usr/share/locale/zh_CN.eucCN/LC_MONETARY
+OLD_FILES+=usr/share/locale/zh_CN.eucCN/LC_NUMERIC
+OLD_FILES+=usr/share/locale/zh_CN.eucCN/LC_TIME
+OLD_FILES+=usr/share/locale/zh_CN.GB18030/LC_COLLATE
+OLD_FILES+=usr/share/locale/zh_CN.GB18030/LC_CTYPE
+OLD_FILES+=usr/share/locale/zh_CN.GB18030/LC_MESSAGES
+OLD_FILES+=usr/share/locale/zh_CN.GB18030/LC_MONETARY
+OLD_FILES+=usr/share/locale/zh_CN.GB18030/LC_NUMERIC
+OLD_FILES+=usr/share/locale/zh_CN.GB18030/LC_TIME
+OLD_FILES+=usr/share/locale/zh_CN.GB2312/LC_COLLATE
+OLD_FILES+=usr/share/locale/zh_CN.GB2312/LC_CTYPE
+OLD_FILES+=usr/share/locale/zh_CN.GB2312/LC_MESSAGES
+OLD_FILES+=usr/share/locale/zh_CN.GB2312/LC_MONETARY
+OLD_FILES+=usr/share/locale/zh_CN.GB2312/LC_NUMERIC
+OLD_FILES+=usr/share/locale/zh_CN.GB2312/LC_TIME
+OLD_FILES+=usr/share/locale/zh_CN.GBK/LC_COLLATE
+OLD_FILES+=usr/share/locale/zh_CN.GBK/LC_CTYPE
+OLD_FILES+=usr/share/locale/zh_CN.GBK/LC_MESSAGES
+OLD_FILES+=usr/share/locale/zh_CN.GBK/LC_MONETARY
+OLD_FILES+=usr/share/locale/zh_CN.GBK/LC_NUMERIC
+OLD_FILES+=usr/share/locale/zh_CN.GBK/LC_TIME
+OLD_FILES+=usr/share/locale/zh_CN.UTF-8/LC_COLLATE
+OLD_FILES+=usr/share/locale/zh_CN.UTF-8/LC_CTYPE
+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
@@ -5348,12 +5357,6 @@ 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_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_Hant_HK.Big5HKSCS/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_MESSAGES
@@ -5378,8 +5381,30 @@ 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_TW.Big5
-OLD_FILES+=usr/share/locale/zh_TW.UTF-8
+OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_COLLATE
+OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_CTYPE
+OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_MESSAGES
+OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_MONETARY
+OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_NUMERIC
+OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/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
+OLD_FILES+=usr/share/locale/zh_HK.UTF-8/LC_MONETARY
+OLD_FILES+=usr/share/locale/zh_HK.UTF-8/LC_NUMERIC
+OLD_FILES+=usr/share/locale/zh_HK.UTF-8/LC_TIME
+OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_COLLATE
+OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_CTYPE
+OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_MESSAGES
+OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_MONETARY
+OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_NUMERIC
+OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_TIME
+OLD_FILES+=usr/share/locale/zh_TW.UTF-8/LC_COLLATE
+OLD_FILES+=usr/share/locale/zh_TW.UTF-8/LC_CTYPE
+OLD_FILES+=usr/share/locale/zh_TW.UTF-8/LC_MESSAGES
+OLD_FILES+=usr/share/locale/zh_TW.UTF-8/LC_MONETARY
+OLD_FILES+=usr/share/locale/zh_TW.UTF-8/LC_NUMERIC
+OLD_FILES+=usr/share/locale/zh_TW.UTF-8/LC_TIME
 .endif
 
 .if ${MK_LOCATE} == no