From dbd5811216fa93d33f6fbcb43f696dbe57ce2ac3 Mon Sep 17 00:00:00 2001 From: ache Date: Tue, 10 Jun 2003 01:54:10 +0000 Subject: [PATCH] Remove deprecated locale names --- usr.bin/calendar/Makefile | 7 +------ usr.bin/catman/catman.c | 2 -- usr.bin/vi/Makefile | 16 ---------------- 3 files changed, 1 insertion(+), 24 deletions(-) diff --git a/usr.bin/calendar/Makefile b/usr.bin/calendar/Makefile index b0921e90c436..c30e943dd293 100644 --- a/usr.bin/calendar/Makefile +++ b/usr.bin/calendar/Makefile @@ -4,9 +4,8 @@ PROG= calendar SRCS= calendar.c io.c day.c ostern.c paskha.c INTER= de_DE.ISO8859-1 fr_FR.ISO8859-1 hr_HR.ISO8859-2 ru_RU.KOI8-R -DE_LINKS= de_DE.ISO_8859-1 de_DE.ISO8859-15 de_DE.ISO_8859-15 +DE_LINKS= de_DE.ISO8859-15 FR_LINKS= fr_FR.ISO8859-15 -HR_LINKS= hr_HR.ISO_8859-2 TEXTMODE?= 444 beforeinstall: @@ -26,9 +25,5 @@ beforeinstall: rm -rf ${DESTDIR}${SHAREDIR}/calendar/${link} ln -s fr_FR.ISO8859-1 ${DESTDIR}${SHAREDIR}/calendar/${link} .endfor -.for link in ${HR_LINKS} - rm -rf ${DESTDIR}${SHAREDIR}/calendar/${link} - ln -s hr_HR.ISO8859-2 ${DESTDIR}${SHAREDIR}/calendar/${link} -.endfor .include diff --git a/usr.bin/catman/catman.c b/usr.bin/catman/catman.c index 43b970b1c1ff..5d181d7d276b 100644 --- a/usr.bin/catman/catman.c +++ b/usr.bin/catman/catman.c @@ -75,9 +75,7 @@ static const char *nroff_device = "ascii"; static const char *locale_device[] = { "KOI8-R", "koi8-r", "ISO8859-1", "latin1", - "ISO_8859-1", "latin1", "ISO8859-15", "latin1", - "ISO_8859-15", "latin1", NULL }; diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile index 9ac57a4ab18a..6f25d7f237c9 100644 --- a/usr.bin/vi/Makefile +++ b/usr.bin/vi/Makefile @@ -79,49 +79,33 @@ afterinstall: ${DESTDIR}/usr/share/vi/catalog for l in ${NLLINKS}; do \ ln -fs dutch ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-1; \ - ln -fs dutch ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-1; \ ln -fs dutch ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-15; \ - ln -fs dutch ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-15; \ done for l in ${ENLINKS}; do \ ln -fs english ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-1; \ - ln -fs english ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-1; \ ln -fs english ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-15; \ - ln -fs english ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-15; \ ln -fs english ${DESTDIR}/usr/share/vi/catalog/$$l.US-ASCII; \ done - ln -fs english ${DESTDIR}/usr/share/vi/catalog/US-ASCII - ln -fs english ${DESTDIR}/usr/share/vi/catalog/ASCII ln -fs english ${DESTDIR}/usr/share/vi/catalog/POSIX ln -fs english ${DESTDIR}/usr/share/vi/catalog/C for l in ${FRLINKS}; do \ ln -fs french ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-1; \ - ln -fs french ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-1; \ ln -fs french ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-15; \ - ln -fs french ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-15; \ done for l in ${DELINKS}; do \ ln -fs german ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-1; \ - ln -fs german ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-1; \ ln -fs german ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-15; \ - ln -fs german ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-15; \ done for l in ${ESLINKS}; do \ ln -fs spanish ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-1; \ - ln -fs spanish ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-1; \ ln -fs spanish ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-15; \ - ln -fs spanish ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-15; \ done for l in ${SVLINKS}; do \ ln -fs swedish ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-1; \ - ln -fs swedish ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-1; \ ln -fs swedish ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-15; \ - ln -fs swedish ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-15; \ done for l in ${PLLINKS}; do \ ln -fs polish ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-2; \ - ln -fs polish ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-2; \ done - ln -fs ru_SU.KOI8-R ${DESTDIR}/usr/share/vi/catalog/ru_RU.KOI8-R .include