From abe5982abe7d97f0ebfa34121d00afcf3fbf2d49 Mon Sep 17 00:00:00 2001 From: John Marino Date: Wed, 4 Nov 2015 17:08:01 +0100 Subject: [PATCH] locales: Remove two more aliases (ja_JP.eucjp and en_US.ISO-8859-1) There was an earlier effort to define common locales (arising from Linux's case-and-hyphen insensitivity) and they were going to be removed when our locale handling followed Linux behavior, but it was decided that we would and should not follow Linux's example. Since then and through collaborative discussions with FreeBSD, it was decided these common-but-incorrect-for-BSD aliases should not continue. FreeBSD will never get them and I'm removing ours. --- Makefile_upgrade.inc | 2 ++ share/locale-links/Makefile | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index 1775f6e569..6e1258936a 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -2228,6 +2228,8 @@ TO_REMOVE+=/usr/include/emulation/posix4 TO_REMOVE+=/usr/libdata/gcc50/tgmath.h TO_REMOVE+=/usr/share/locale/*.UTF8 TO_REMOVE+=/usr/include/lzma/lzma.h +TO_REMOVE+=/usr/share/locale/en_US.ISO-8859-1 +TO_REMOVE+=/usr/share/locale/ja_JP.eucjp .if !defined(WANT_INSTALLER) TO_REMOVE+=/usr/sbin/dfuibe_installer diff --git a/share/locale-links/Makefile b/share/locale-links/Makefile index ac52aa7ba2..5381329b86 100644 --- a/share/locale-links/Makefile +++ b/share/locale-links/Makefile @@ -37,9 +37,7 @@ LOCALEDIR= /usr/share/locale SYMLINKS= lt_LT.ISO8859-13 ${LOCALEDIR}/lt_LT \ el_GR.ISO8859-7 ${LOCALEDIR}/el_GR \ - lv_LV.ISO8859-13 ${LOCALEDIR}/lv_LV \ - en_US.ISO8859-1 ${LOCALEDIR}/en_US.ISO-8859-1 \ - ja_JP.eucJP ${LOCALEDIR}/ja_JP.eucjp + lv_LV.ISO8859-13 ${LOCALEDIR}/lv_LV .for symdir in ${STD1} SYMLINKS+= ${symdir}.ISO8859-1 ${LOCALEDIR}/${symdir} -- 2.41.0