From a187448dff085b77e75c884a0ac02269cef620b3 Mon Sep 17 00:00:00 2001 From: John Marino Date: Thu, 13 Aug 2015 12:57:40 +0200 Subject: [PATCH] Regenerate locales (common.UTF-8 => xx_Comm_US.UTF-8) A rename is required because some applications check the format of the locale name, so we need to use a legal one (e.g. xx_Yyyy_ZZ.) --- Makefile_upgrade.inc | 1 + etc/mtree/BSD.local.dist | 4 ++-- etc/mtree/BSD.usr.dist | 4 ++-- share/colldef/Makefile | 2 +- share/ctypedef/Makefile | 2 +- share/ctypedef/{common.UTF-8.src => xx_Comm_US.UTF-8.src} | 0 share/monetdef/Makefile | 6 +++--- share/msgdef/Makefile | 2 +- share/numericdef/Makefile | 2 +- share/timedef/Makefile | 6 +++--- 10 files changed, 15 insertions(+), 14 deletions(-) rename share/ctypedef/{common.UTF-8.src => xx_Comm_US.UTF-8.src} (100%) diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index 3d108b521b..e9e9625001 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -2199,6 +2199,7 @@ TO_REMOVE+=/usr/share/locale/nl_??.ISO8859-1 TO_REMOVE+=/usr/share/locale/pt_PT.ISO8859-1 TO_REMOVE+=/usr/share/locale/sv_??.ISO8859-1 TO_REMOVE+=/boot/kernel/glxsb.ko +TO_REMOVE+=/usr/share/locale/common.UTF-8 .if ${MACHINE_ARCH} == "x86_64" TO_REMOVE+=/usr/sbin/kgzip diff --git a/etc/mtree/BSD.local.dist b/etc/mtree/BSD.local.dist index 7fa3e3eea9..34d315c429 100644 --- a/etc/mtree/BSD.local.dist +++ b/etc/mtree/BSD.local.dist @@ -293,8 +293,6 @@ .. ca_ES.UTF-8 .. - common.UTF-8 - .. cs_CZ.ISO8859-2 .. cs_CZ.UTF-8 @@ -539,6 +537,8 @@ .. uk_UA.UTF-8 .. + xx_Comm_US.UTF-8 + .. zh_Hans_CN.GB18030 .. zh_Hans_CN.GB2312 diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 7bc3ac8e55..ba59336679 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -415,8 +415,6 @@ .. ca_IT.UTF-8 .. - common.UTF-8 - .. cs_CZ.ISO8859-2 .. cs_CZ.UTF-8 @@ -669,6 +667,8 @@ .. uk_UA.UTF-8 .. + xx_Comm_US.UTF-8 + .. zh_Hans_CN.GB18030 .. zh_Hans_CN.GB2312 diff --git a/share/colldef/Makefile b/share/colldef/Makefile index 6e8d4f0cf3..15034edc11 100644 --- a/share/colldef/Makefile +++ b/share/colldef/Makefile @@ -67,6 +67,7 @@ SAME+= ca_AD.UTF-8:ca_ES.ISO8859-15 SAME+= ca_AD.UTF-8:ca_AD.ISO8859-15 SAME+= cs_CZ.UTF-8:cs_CZ.ISO8859-2 SAME+= da_DK.UTF-8:da_DK.ISO8859-15 +SAME+= en_US.UTF-8:xx_Comm_US.UTF-8 SAME+= en_US.UTF-8:sr_Latn_RS.UTF-8 SAME+= en_US.UTF-8:sr_Latn_RS.ISO8859-2 SAME+= en_US.UTF-8:pt_PT.UTF-8 @@ -111,7 +112,6 @@ 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:common.UTF-8 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-1 diff --git a/share/ctypedef/Makefile b/share/ctypedef/Makefile index 2c7426418e..71db4ce50b 100644 --- a/share/ctypedef/Makefile +++ b/share/ctypedef/Makefile @@ -17,7 +17,6 @@ LOCALES+= ca_IT.ISO8859-15 LOCALES+= ca_IT.UTF-8 LOCALES+= el_GR.ISO8859-7 LOCALES+= el_GR.UTF-8 -LOCALES+= common.UTF-8 LOCALES+= en_GB.ISO8859-15 LOCALES+= en_US.ISO8859-1 LOCALES+= en_US.US-ASCII @@ -44,6 +43,7 @@ LOCALES+= uk_UA.CP1251 LOCALES+= uk_UA.ISO8859-5 LOCALES+= uk_UA.KOI8-U LOCALES+= uk_UA.UTF-8 +LOCALES+= xx_Comm_US.UTF-8 LOCALES+= zh_Hans_CN.GB18030 LOCALES+= zh_Hans_CN.GB2312 LOCALES+= zh_Hans_CN.GBK diff --git a/share/ctypedef/common.UTF-8.src b/share/ctypedef/xx_Comm_US.UTF-8.src similarity index 100% rename from share/ctypedef/common.UTF-8.src rename to share/ctypedef/xx_Comm_US.UTF-8.src diff --git a/share/monetdef/Makefile b/share/monetdef/Makefile index dbb02961a9..1b78b37f8a 100644 --- a/share/monetdef/Makefile +++ b/share/monetdef/Makefile @@ -130,15 +130,15 @@ SAME+= en_AU.UTF-8:en_AU.US-ASCII SAME+= en_AU.UTF-8:en_AU.ISO8859-1 SAME+= en_CA.UTF-8:en_CA.US-ASCII SAME+= en_CA.UTF-8:en_CA.ISO8859-1 -SAME+= en_US.UTF-8:en_US.US-ASCII -SAME+= en_US.UTF-8:en_US.ISO8859-1 -SAME+= en_US.UTF-8:common.UTF-8 SAME+= zh_Hant_HK.UTF-8:zh_Hant_HK.Big5HKSCS SAME+= zh_Hant_HK.UTF-8:en_HK.UTF-8 SAME+= zh_Hant_HK.UTF-8:en_HK.ISO8859-1 SAME+= en_NZ.UTF-8:en_NZ.US-ASCII SAME+= en_NZ.UTF-8:en_NZ.ISO8859-1 SAME+= en_SG.UTF-8:en_SG.ISO8859-1 +SAME+= en_US.UTF-8:en_US.US-ASCII +SAME+= en_US.UTF-8:en_US.ISO8859-1 +SAME+= en_US.UTF-8:xx_Comm_US.UTF-8 SAME+= es_AR.UTF-8:es_AR.ISO8859-1 SAME+= es_MX.UTF-8:es_MX.ISO8859-1 SAME+= sv_FI.ISO8859-15:pt_PT.ISO8859-15 diff --git a/share/msgdef/Makefile b/share/msgdef/Makefile index 85fde746cb..e438b1228a 100644 --- a/share/msgdef/Makefile +++ b/share/msgdef/Makefile @@ -134,7 +134,7 @@ 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-1 -SAME+= en_US.UTF-8:common.UTF-8 +SAME+= en_US.UTF-8:xx_Comm_US.UTF-8 SAME+= et_EE.UTF-8:et_EE.ISO8859-15 SAME+= eu_ES.UTF-8:eu_ES.ISO8859-15 SAME+= fr_FR.UTF-8:fr_FR.ISO8859-15 diff --git a/share/numericdef/Makefile b/share/numericdef/Makefile index c7f5bc97ab..88e3c365f2 100644 --- a/share/numericdef/Makefile +++ b/share/numericdef/Makefile @@ -108,7 +108,7 @@ 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-1 SAME+= en_US.UTF-8:am_ET.UTF-8 -SAME+= en_US.UTF-8:common.UTF-8 +SAME+= en_US.UTF-8:xx_Comm_US.UTF-8 SAME+= ru_RU.CP866:be_BY.CP1131 SAME+= tr_TR.UTF-8:tr_TR.ISO8859-9 SAME+= tr_TR.UTF-8:sl_SI.UTF-8 diff --git a/share/timedef/Makefile b/share/timedef/Makefile index 6dd2681656..44d67039c1 100644 --- a/share/timedef/Makefile +++ b/share/timedef/Makefile @@ -143,9 +143,6 @@ SAME+= en_HK.UTF-8:en_AU.US-ASCII SAME+= en_HK.UTF-8:en_AU.ISO8859-1 SAME+= en_CA.UTF-8:en_CA.US-ASCII SAME+= en_CA.UTF-8:en_CA.ISO8859-1 -SAME+= en_US.UTF-8:en_US.US-ASCII -SAME+= en_US.UTF-8:en_US.ISO8859-1 -SAME+= en_US.UTF-8:common.UTF-8 SAME+= en_GB.UTF-8:en_GB.US-ASCII SAME+= en_GB.UTF-8:en_GB.ISO8859-15 SAME+= en_IE.UTF-8:en_IE.ISO8859-15 @@ -153,6 +150,9 @@ 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-1 +SAME+= en_US.UTF-8:en_US.US-ASCII +SAME+= en_US.UTF-8:en_US.ISO8859-1 +SAME+= en_US.UTF-8:xx_Comm_US.UTF-8 SAME+= en_ZA.UTF-8:en_ZA.US-ASCII SAME+= en_ZA.UTF-8:en_ZA.ISO8859-1 SAME+= es_CR.UTF-8:es_AR.UTF-8 -- 2.41.0