From 64a16b4f7e4ae6b9cb49800744801e7b38e5e773 Mon Sep 17 00:00:00 2001 From: itojun Date: Mon, 22 Jan 2001 17:48:15 +0000 Subject: [PATCH] ru_SU locales are deprecated, ru_RU is now correct one. rename LC_CTYPE locale declarations and vi message catalog. From: Oleg Polyanski --- distrib/sets/lists/base/mi | 10 ++-------- distrib/sets/lists/base/obsolete.mi | 9 ++++++++- etc/mtree/NetBSD.dist | 17 +--------------- share/locale/ctype/Makefile.inc | 20 ++++--------------- .../{ru_SU.CP866.src => ru_RU.CP866.src} | 2 +- ...SU.ISO_8859-5.src => ru_RU.ISO_8859-5.src} | 2 +- .../{ru_SU.KOI8-R.src => ru_RU.KOI8-R.src} | 2 +- usr.bin/vi/build/Makefile | 4 ++-- usr.bin/vi/catalog/Makefile | 6 +++--- .../vi/catalog/{ru_SU.KOI8-R => ru_RU.KOI8-R} | 0 .../{ru_SU.KOI8-R.base => ru_RU.KOI8-R.base} | 0 ...{ru_SU.KOI8-R.check => ru_RU.KOI8-R.check} | 0 ...{ru_SU.KOI8-R.owner => ru_RU.KOI8-R.owner} | 0 13 files changed, 23 insertions(+), 49 deletions(-) rename share/locale/ctype/{ru_SU.CP866.src => ru_RU.CP866.src} (95%) rename share/locale/ctype/{ru_SU.ISO_8859-5.src => ru_RU.ISO_8859-5.src} (98%) rename share/locale/ctype/{ru_SU.KOI8-R.src => ru_RU.KOI8-R.src} (94%) rename usr.bin/vi/catalog/{ru_SU.KOI8-R => ru_RU.KOI8-R} (100%) rename usr.bin/vi/catalog/{ru_SU.KOI8-R.base => ru_RU.KOI8-R.base} (100%) rename usr.bin/vi/catalog/{ru_SU.KOI8-R.check => ru_RU.KOI8-R.check} (100%) rename usr.bin/vi/catalog/{ru_SU.KOI8-R.owner => ru_RU.KOI8-R.owner} (100%) diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi index a910b1e8d798..08fea1df1eb2 100644 --- a/distrib/sets/lists/base/mi +++ b/distrib/sets/lists/base/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.212 2001/01/20 16:33:03 itojun Exp $ +# $NetBSD: mi,v 1.213 2001/01/22 17:48:15 itojun Exp $ . ./altroot ./bin @@ -1057,12 +1057,6 @@ ./usr/share/locale/ru_RU.ISO8859-5/LC_CTYPE ./usr/share/locale/ru_RU.KOI8-R ./usr/share/locale/ru_RU.KOI8-R/LC_CTYPE -./usr/share/locale/ru_SU.CP866 -./usr/share/locale/ru_SU.CP866/LC_CTYPE -./usr/share/locale/ru_SU.ISO8859-5 -./usr/share/locale/ru_SU.ISO8859-5/LC_CTYPE -./usr/share/locale/ru_SU.KOI8-R -./usr/share/locale/ru_SU.KOI8-R/LC_CTYPE ./usr/share/locale/sl ./usr/share/locale/sl/LC_MESSAGES ./usr/share/locale/sl/LC_MESSAGES/grep.mo @@ -1378,7 +1372,7 @@ ./usr/share/vi/catalog/dutch ./usr/share/vi/catalog/english ./usr/share/vi/catalog/german -./usr/share/vi/catalog/ru_SU.KOI8-R +./usr/share/vi/catalog/ru_RU.KOI8-R ./usr/share/vi/catalog/swedish ./usr/share/wscons ./usr/share/wscons/fonts diff --git a/distrib/sets/lists/base/obsolete.mi b/distrib/sets/lists/base/obsolete.mi index 7651d037b17e..55bb4842182d 100644 --- a/distrib/sets/lists/base/obsolete.mi +++ b/distrib/sets/lists/base/obsolete.mi @@ -1,4 +1,4 @@ -# $NetBSD: obsolete.mi,v 1.16 2000/12/14 04:15:54 jmc Exp $ +# $NetBSD: obsolete.mi,v 1.17 2001/01/22 17:48:16 itojun Exp $ /bin/rcorder /dev/log /etc/disklabels @@ -49,12 +49,19 @@ /usr/share/lkm/syscall/test /usr/share/lkm/vfs /usr/share/lkm/vfs/module +/usr/share/locale/ru_SU.CP866 +/usr/share/locale/ru_SU.CP866/LC_CTYPE +/usr/share/locale/ru_SU.ISO8859-5 +/usr/share/locale/ru_SU.ISO8859-5/LC_CTYPE +/usr/share/locale/ru_SU.KOI8-R +/usr/share/locale/ru_SU.KOI8-R/LC_CTYPE /usr/share/man/cat4/tahoe /usr/share/man/cat8/tahoe /usr/share/man/man4/tahoe /usr/share/man/man8/tahoe /usr/share/misc/getopt /usr/share/misc/more.help +/usr/share/vi/catalog/ru_SU.KOI8-R /usr/share/zoneinfo/Africa/Lumumbashi /usr/share/zoneinfo/Asia/Aktau /usr/share/zoneinfo/Asia/Alma-Ata diff --git a/etc/mtree/NetBSD.dist b/etc/mtree/NetBSD.dist index 0f452b3a7f3c..8beee4875cbb 100644 --- a/etc/mtree/NetBSD.dist +++ b/etc/mtree/NetBSD.dist @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist,v 1.135 2001/01/21 15:01:36 itojun Exp $ +# $NetBSD: NetBSD.dist,v 1.136 2001/01/22 17:48:17 itojun Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 /set type=dir uname=root gname=wheel mode=0755 @@ -1548,21 +1548,6 @@ ru_RU.KOI8-R # ./usr/share/locale/ru_RU.KOI8-R .. -# ./usr/share/locale/ru_SU.CP866 -ru_SU.CP866 -# ./usr/share/locale/ru_SU.CP866 -.. - -# ./usr/share/locale/ru_SU.ISO8859-5 -ru_SU.ISO8859-5 -# ./usr/share/locale/ru_SU.ISO8859-5 -.. - -# ./usr/share/locale/ru_SU.KOI8-R -ru_SU.KOI8-R -# ./usr/share/locale/ru_SU.KOI8-R -.. - # ./usr/share/locale/sl sl diff --git a/share/locale/ctype/Makefile.inc b/share/locale/ctype/Makefile.inc index 57ab6ee73677..8976aaaea4d3 100644 --- a/share/locale/ctype/Makefile.inc +++ b/share/locale/ctype/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.2 2001/01/20 16:33:02 itojun Exp $ +# $NetBSD: Makefile.inc,v 1.3 2001/01/22 17:48:19 itojun Exp $ # $FreeBSD: src/usr.bin/mklocale/data/Makefile,v 1.17.2.3 1999/08/29 15:31:04 peter Exp $ NOMAN=YES @@ -249,29 +249,17 @@ LOCALES += zh_TW.Big5 ALIASES_zh_TW.Big5+= zh_TW.BIG5 LOCALES += ru_RU.CP866 - LOCALESRC_ru_RU.CP866 = ru_SU.CP866 + LOCALESRC_ru_RU.CP866 = ru_RU.CP866 ALIASES_ru_RU.CP866+= LOCALES += ru_RU.KOI8-R - LOCALESRC_ru_RU.KOI8-R = ru_SU.KOI8-R + LOCALESRC_ru_RU.KOI8-R = ru_RU.KOI8-R ALIASES_ru_RU.KOI8-R+= LOCALES += ru_RU.ISO8859-5 - LOCALESRC_ru_RU.ISO8859-5 = ru_SU.ISO_8859-5 + LOCALESRC_ru_RU.ISO8859-5 = ru_RU.ISO_8859-5 ALIASES_ru_RU.ISO8859-5+= -LOCALES += ru_SU.CP866 - LOCALESRC_ru_SU.CP866 = ru_SU.CP866 - ALIASES_ru_SU.CP866+= - -LOCALES += ru_SU.KOI8-R - LOCALESRC_ru_SU.KOI8-R = ru_SU.KOI8-R - ALIASES_ru_SU.KOI8-R+= - -LOCALES += ru_SU.ISO8859-5 - LOCALESRC_ru_SU.ISO8859-5 = ru_SU.ISO_8859-5 - ALIASES_ru_SU.ISO8859-5+= - LOCALES += uk_UA.KOI8-U LOCALESRC_uk_UA.KOI8-U = uk_UA.KOI8-U ALIASES_uk_UA.KOI8-U+= diff --git a/share/locale/ctype/ru_SU.CP866.src b/share/locale/ctype/ru_RU.CP866.src similarity index 95% rename from share/locale/ctype/ru_SU.CP866.src rename to share/locale/ctype/ru_RU.CP866.src index 963f9f0d3324..1fe69b4c330d 100644 --- a/share/locale/ctype/ru_SU.CP866.src +++ b/share/locale/ctype/ru_RU.CP866.src @@ -1,4 +1,4 @@ -/* $NetBSD: ru_SU.CP866.src,v 1.1 2000/12/30 02:33:16 itojun Exp $ */ +/* $NetBSD: ru_RU.CP866.src,v 1.1 2001/01/22 17:48:19 itojun Exp $ */ /* * LOCALE_CTYPE for Russian Alternative character set (CP866) diff --git a/share/locale/ctype/ru_SU.ISO_8859-5.src b/share/locale/ctype/ru_RU.ISO_8859-5.src similarity index 98% rename from share/locale/ctype/ru_SU.ISO_8859-5.src rename to share/locale/ctype/ru_RU.ISO_8859-5.src index 744e35f974e2..f48f512be721 100644 --- a/share/locale/ctype/ru_SU.ISO_8859-5.src +++ b/share/locale/ctype/ru_RU.ISO_8859-5.src @@ -1,4 +1,4 @@ -/* $NetBSD: ru_SU.ISO_8859-5.src,v 1.1 2000/12/30 02:33:16 itojun Exp $ */ +/* $NetBSD: ru_RU.ISO_8859-5.src,v 1.1 2001/01/22 17:48:20 itojun Exp $ */ /* * LOCALE_CTYPE for Russian part of ISO8859-5 set diff --git a/share/locale/ctype/ru_SU.KOI8-R.src b/share/locale/ctype/ru_RU.KOI8-R.src similarity index 94% rename from share/locale/ctype/ru_SU.KOI8-R.src rename to share/locale/ctype/ru_RU.KOI8-R.src index 97edc8310cfd..1d5b13b40972 100644 --- a/share/locale/ctype/ru_SU.KOI8-R.src +++ b/share/locale/ctype/ru_RU.KOI8-R.src @@ -1,4 +1,4 @@ -/* $NetBSD: ru_SU.KOI8-R.src,v 1.1 2000/12/30 02:33:17 itojun Exp $ */ +/* $NetBSD: ru_RU.KOI8-R.src,v 1.1 2001/01/22 17:48:21 itojun Exp $ */ /* * LOCALE_CTYPE for Russian koi8-r character set (RFC1489) diff --git a/usr.bin/vi/build/Makefile b/usr.bin/vi/build/Makefile index e89f739fa400..0c2db7f551fa 100644 --- a/usr.bin/vi/build/Makefile +++ b/usr.bin/vi/build/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 1999/02/13 02:54:57 lukem Exp $ +# $NetBSD: Makefile,v 1.16 2001/01/22 17:48:27 itojun Exp $ # # from: @(#)Makefile.in 8.56 (Berkeley) 5/18/96 @@ -36,7 +36,7 @@ MLINKS= vi.1 ex.1 vi.1 view.1 .PATH: ${.CURDIR}/../common ${.CURDIR}/../docs/USD.doc/vi.man .if ${MKSHARE} != "no" -cat= dutch english german ru_SU.KOI8-R swedish +cat= dutch english german ru_RU.KOI8-R swedish FILES=${cat:S@^@${.CURDIR}/../catalog/@g} FILESDIR=/usr/share/vi/catalog .endif diff --git a/usr.bin/vi/catalog/Makefile b/usr.bin/vi/catalog/Makefile index 3a99833ccca6..4a78487c41b2 100644 --- a/usr.bin/vi/catalog/Makefile +++ b/usr.bin/vi/catalog/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 1998/01/09 08:06:16 perry Exp $ +# $NetBSD: Makefile,v 1.3 2001/01/22 17:48:27 itojun Exp $ # # @(#)Makefile 8.23 (Berkeley) 5/2/96 -CAT= dutch english german ru_SU.KOI8-R swedish +CAT= dutch english german ru_RU.KOI8-R swedish FILES= ../cl/*.c ../common/*.c ../ex/*.c ../perl_api/*.c ../tcl_api/*.c \ ../tk/*.c ../vi/*.c @@ -36,7 +36,7 @@ ${CAT}: english.base grep 'NOT LEGAL' $@; \ fi -CHK= dutch.check english.check german.check ru_SU.KOI8-R.check \ +CHK= dutch.check english.check german.check ru_RU.KOI8-R.check \ swedish.check check: ${CHK} ${CHK}: ${CAT} diff --git a/usr.bin/vi/catalog/ru_SU.KOI8-R b/usr.bin/vi/catalog/ru_RU.KOI8-R similarity index 100% rename from usr.bin/vi/catalog/ru_SU.KOI8-R rename to usr.bin/vi/catalog/ru_RU.KOI8-R diff --git a/usr.bin/vi/catalog/ru_SU.KOI8-R.base b/usr.bin/vi/catalog/ru_RU.KOI8-R.base similarity index 100% rename from usr.bin/vi/catalog/ru_SU.KOI8-R.base rename to usr.bin/vi/catalog/ru_RU.KOI8-R.base diff --git a/usr.bin/vi/catalog/ru_SU.KOI8-R.check b/usr.bin/vi/catalog/ru_RU.KOI8-R.check similarity index 100% rename from usr.bin/vi/catalog/ru_SU.KOI8-R.check rename to usr.bin/vi/catalog/ru_RU.KOI8-R.check diff --git a/usr.bin/vi/catalog/ru_SU.KOI8-R.owner b/usr.bin/vi/catalog/ru_RU.KOI8-R.owner similarity index 100% rename from usr.bin/vi/catalog/ru_SU.KOI8-R.owner rename to usr.bin/vi/catalog/ru_RU.KOI8-R.owner