From: John Marino <draco@marino.st>
Date: Mon, 10 Aug 2015 09:44:49 +0000 (+0200)
Subject: locales: Remove new ISO-8859-15@euro symlinks
X-Git-Url: https://gitweb.dragonflybsd.org/~nant/dragonfly.git/commitdiff_plain/a401b017cf17fc513ec3fd39c97183af013023b4

locales: Remove new ISO-8859-15@euro symlinks

We're in the process of thinking hard about locale symlinks.  These
new ISO-8859-15@euro symlinks (to their ISO8859-15 counterparts) were
a bad idea that I copied from Linuxland.  Let's reverse this before it
gets released in DragonFly.

It doesn't even make sense. @euro is basically shorthand for ISO8859-15,
so what value does it have to "modify" that encoding? Stop the Linuxanity
now ...
---

diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc
index 13e1226876..33de0eca2c 100644
--- a/Makefile_upgrade.inc
+++ b/Makefile_upgrade.inc
@@ -2164,6 +2164,7 @@ TO_REMOVE+=/usr/share/man/man4/i386/stl.4.gz
 TO_REMOVE+=/boot/kernel/pst.ko
 TO_REMOVE+=/usr/share/tmac/mdoc/ru.KOI8-R
 TO_REMOVE+=/usr/bin/colldef
+TO_REMOVE+=/usr/share/locale/*.ISO-8859-15@euro
 
 .if ${MACHINE_ARCH} == "x86_64"
 TO_REMOVE+=/usr/sbin/kgzip
diff --git a/share/locale-links/Makefile b/share/locale-links/Makefile
index 64c53114a9..bda76ac87e 100644
--- a/share/locale-links/Makefile
+++ b/share/locale-links/Makefile
@@ -55,7 +55,6 @@ SYMLINKS+=	${symdir}.UTF-8 ${LOCALEDIR}/${symdir}.UTF8
 .endfor
 .for symdir in ${EURO}
 SYMLINKS+=	${symdir}.ISO8859-15 ${LOCALEDIR}/${symdir}@euro
-SYMLINKS+=	${symdir}.ISO8859-15 ${LOCALEDIR}/${symdir}.ISO-8859-15@euro
 .endfor
 
 # We need to keep zh_CN.* around as aliases to zh_Hans_CN.* because some