locales: Remove two more aliases (ja_JP.eucjp and en_US.ISO-8859-1)
authorJohn Marino <draco@marino.st>
Wed, 4 Nov 2015 16:08:01 +0000 (17:08 +0100)
committerJohn Marino <draco@marino.st>
Wed, 4 Nov 2015 16:08:01 +0000 (17:08 +0100)
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
share/locale-links/Makefile

index 1775f6e..6e12589 100644 (file)
@@ -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
index ac52aa7..5381329 100644 (file)
@@ -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}