Get rid of deprecated ru_SU.* locales. ru_RU.* will be used instead.

15 files changed, 16 insertions, 700 deletions

diff --git a/etc/locale.alias b/etc/locale.alias
index 958dfaa..da79333 100644
--- a/etc/locale.alias
+++ b/etc/locale.alias
@@ -1,5 +1,2 @@
 ASCII		en_US.ISO_8859-1
 US-ASCII	en_US.ISO_8859-1
-ru_RU.KOI8-R	ru_SU.KOI8-R
-ru_RU.CP866	ru_SU.CP866
-ru_RU.ISO_8859-5        ru_SU.ISO_8859-5
diff --git a/share/colldef/Makefile b/share/colldef/Makefile
index 6b2c54c..0ac770e 100644
--- a/share/colldef/Makefile
+++ b/share/colldef/Makefile
@@ -16,9 +16,9 @@ LOCALES=	cs_CZ.ISO_8859-2 \
 		la_LN.ISO_8859-2 \
 		la_LN.ISO_8859-4 \
 		lt_LT.ISO_8859-4 \
-		ru_SU.CP866 \
-		ru_SU.ISO_8859-5 \
-		ru_SU.KOI8-R \
+		ru_RU.CP866 \
+		ru_RU.ISO_8859-5 \
+		ru_RU.KOI8-R \
 		sv_SE.DIS_8859-15 \
 		sv_SE.ISO_8859-1 \
 		uk_UA.KOI8-U
@@ -57,9 +57,9 @@ la_LN.DIS_8859-15.out:  map.DIS_8859-15
 la_LN.ISO_8859-1.out:   map.ISO_8859-1
 la_LN.ISO_8859-4.out:   map.ISO_8859-4
 lt_LT.ISO_8859-4.out:   map.ISO_8859-4
-ru_SU.CP866.out:        map.CP866
-ru_SU.ISO_8859-5.out:   map.ISO_8859-5
-ru_SU.KOI8-R.out:       map.KOI8-R
+ru_RU.CP866.out:        map.CP866
+ru_RU.ISO_8859-5.out:   map.ISO_8859-5
+ru_RU.KOI8-R.out:       map.KOI8-R
 sv_SE.DIS_8859-15.out:  map.DIS_8859-15
 sv_SE.ISO_8859-1.out:   map.ISO_8859-1
 uk_UA.KOI8-U.out:       map.KOI8-U
diff --git a/share/colldef/ru_SU.CP866.src b/share/colldef/ru_SU.CP866.src
deleted file mode 100644
index 2fc2d20..0000000
--- a/share/colldef/ru_SU.CP866.src
+++ /dev/null
@@ -1,39 +0,0 @@
-# CP866 (backward compatible with ASCII)
-#
-# $FreeBSD$
-#
-charmap map.CP866
-order \
-# controls
-	<NU>;...;<US>;\
-#
-	<NS>;<SP>;!;\";<Nb>;<DO>;\
-	%;&;';\(;\);*;+;<-:>;\,;-;.;/;\
-# digits
-	0;1;(2,<2S>);3;...;9;\
-#
-	:;\;;\<;<=<>;=;</>=>;>;?;<Co>;<At>;\
-# capital
-	A;...;Z;\
-	<A=>;<B=>;<V=>;<G=>;<D=>;<E=>;<IO>;<Z%>;<Z=>;\
-	<I=>;<J=>;<K=>;<L=>;<M=>;<N=>;<O=>;<P=>;<R=>;\
-	<S=>;<T=>;<U=>;<F=>;<H=>;<C=>;<C%>;<S%>;<Sc>;\
-	<=">;<Y=>;<%">;<JE>;<JU>;<JA>;\
-#
-	[;\\;];^;_;`;\
-# small
-	a;...;z;\
-	<a=>;<b=>;<v=>;<g=>;<d=>;<e=>;<io>;<z%>;<z=>;\
-	<i=>;<j=>;<k=>;<l=>;<m=>;<n=>;<o=>;<p=>;<r=>;\
-	<s=>;<t=>;<u=>;<f=>;<h=>;<c=>;<c%>;<s%>;<sc>;\
-	<='>;<y=>;<%'>;<je>;<ju>;<ja>;\
-#
-	\{;|;\};~;<.M>;<DG>;<DT>;\
-#
-	<sb>;<RT>;<?2>;<Iu>;<Il>;\
-	<hh>;<HH>;<vv>;<VV>;<dr>;<dR>;<Dr>;<DR>;\
-	<dl>;<dL>;<Dl>;<LD>;<ur>;<uR>;<Ur>;<UR>;\
-	<ul>;<uL>;<Ul>;<UL>;<vr>;<vR>;<Vr>;<VR>;\
-	<vl>;<vL>;<Vl>;<VL>;<dh>;<dH>;<Dh>;<DH>;\
-	<uh>;<uH>;<Uh>;<UH>;<vh>;<vH>;<Vh>;<VH>;\
-	<TB>;<LB>;<FB>;<lB>;<RB>;<.S>;<:S>;<?S>;<fS>
diff --git a/share/colldef/ru_SU.ISO_8859-5.src b/share/colldef/ru_SU.ISO_8859-5.src
deleted file mode 100644
index 459851d..0000000
--- a/share/colldef/ru_SU.ISO_8859-5.src
+++ /dev/null
@@ -1,37 +0,0 @@
-# Russian part of ISO8859-5 (backward compatible with ASCII)
-#
-# $FreeBSD$
-#
-charmap map.ISO_8859-5
-order \
-# controls
-	<NU>;...;<US>;\
-#
-	<NS>;<SP>;!;\";<Nb>;<DO>;\
-	%;&;';\(;\);*;+;\,;-;.;/;\
-# digits
-	0;...;9;\
-#
-	:;\;;\<;=;>;?;<At>;\
-# capital
-	A;...;Z;\
-	<A=>;<B=>;<V=>;<G=>;<D=>;<E=>;<IO>;<Z%>;<Z=>;\
-	<I=>;<J=>;<K=>;<L=>;<M=>;<N=>;<O=>;<P=>;<R=>;\
-	<S=>;<T=>;<U=>;<F=>;<H=>;<C=>;<C%>;<S%>;<Sc>;\
-	<=">;<Y=>;<%">;<JE>;<JU>;<JA>;\
-#
-	[;\\;];^;_;`;\
-# small
-	a;...;z;\
-	<a=>;<b=>;<v=>;<g=>;<d=>;<e=>;<io>;<z%>;<z=>;\
-	<i=>;<j=>;<k=>;<l=>;<m=>;<n=>;<o=>;<p=>;<r=>;\
-	<s=>;<t=>;<u=>;<f=>;<h=>;<c=>;<c%>;<s%>;<sc>;\
-	<='>;<y=>;<%'>;<je>;<ju>;<ja>;\
-#
-	\{;|;\};~;<DT>;<PA>;<HO>;<BH>;<NH>;<IN>;<NL>;\
-	<SA>;<ES>;<HS>;<HJ>;<VS>;<PD>;<PU>;<RI>;<S2>;\
-	<S3>;<DC>;<P1>;<P2>;<TS>;<CC>;<MW>;<SG>;<EG>;\
-	<SS>;<GC>;<SC>;<CI>;<ST>;<OC>;<PM>;<AC>;<D%>;\
-	<G%>;<IE>;<DS>;<II>;<YI>;<J%>;<LJ>;<NJ>;<Ts>;\
-	<KJ>;<-->;<V%>;<DZ>;<N0>;<d%>;<g%>;<ie>;<ds>;\
-	<ii>;<yi>;<j%>;<lj>;<nj>;<ts>;<kj>;<SE>;<v%>;<dz>
diff --git a/share/colldef/ru_SU.KOI8-R.src b/share/colldef/ru_SU.KOI8-R.src
deleted file mode 100644
index 3a67bc4..0000000
--- a/share/colldef/ru_SU.KOI8-R.src
+++ /dev/null
@@ -1,39 +0,0 @@
-# koi8-r (backward compatible with ASCII)
-#
-# $FreeBSD$
-#
-charmap map.KOI8-R
-order \
-# controls
-	<NU>;...;<US>;\
-#
-	<NS>;<SP>;!;\";<Nb>;<DO>;\
-	%;&;';\(;\);*;+;<-:>;\,;-;.;/;\
-# digits
-	0;1;(2,<2S>);3;...;9;\
-#
-	:;\;;\<;<=<>;=;</>=>;>;?;<Co>;<At>;\
-# capital
-	A;...;Z;\
-	<A=>;<B=>;<V=>;<G=>;<D=>;<E=>;<IO>;<Z%>;<Z=>;\
-	<I=>;<J=>;<K=>;<L=>;<M=>;<N=>;<O=>;<P=>;<R=>;\
-	<S=>;<T=>;<U=>;<F=>;<H=>;<C=>;<C%>;<S%>;<Sc>;\
-	<=">;<Y=>;<%">;<JE>;<JU>;<JA>;\
-#
-	[;\\;];^;_;`;\
-# small
-	a;...;z;\
-	<a=>;<b=>;<v=>;<g=>;<d=>;<e=>;<io>;<z%>;<z=>;\
-	<i=>;<j=>;<k=>;<l=>;<m=>;<n=>;<o=>;<p=>;<r=>;\
-	<s=>;<t=>;<u=>;<f=>;<h=>;<c=>;<c%>;<s%>;<sc>;\
-	<='>;<y=>;<%'>;<je>;<ju>;<ja>;\
-#
-	\{;|;\};~;<.M>;<DG>;<DT>;\
-#
-	<sb>;<RT>;<?2>;<Iu>;<Il>;\
-	<hh>;<HH>;<vv>;<VV>;<dr>;<dR>;<Dr>;<DR>;\
-	<dl>;<dL>;<Dl>;<LD>;<ur>;<uR>;<Ur>;<UR>;\
-	<ul>;<uL>;<Ul>;<UL>;<vr>;<vR>;<Vr>;<VR>;\
-	<vl>;<vL>;<Vl>;<VL>;<dh>;<dH>;<Dh>;<DH>;\
-	<uh>;<uH>;<Uh>;<UH>;<vh>;<vH>;<Vh>;<VH>;\
-	<TB>;<LB>;<FB>;<lB>;<RB>;<.S>;<:S>;<?S>;<fS>
diff --git a/share/mklocale/Makefile b/share/mklocale/Makefile
index e184fee..e37838c 100644
--- a/share/mklocale/Makefile
+++ b/share/mklocale/Makefile
@@ -11,9 +11,9 @@ LOCALES=        ja_JP.EUC \
 		la_LN.ISO_8859-2 \
 		la_LN.ISO_8859-4 \
 		la_LN.DIS_8859-15 \
-		ru_SU.CP866 \
-		ru_SU.ISO_8859-5 \
-		ru_SU.KOI8-R \
+		ru_RU.CP866 \
+		ru_RU.ISO_8859-5 \
+		ru_RU.KOI8-R \
 		uk_UA.KOI8-U \
 		zh_CN.EUC \
 		zh_TW.Big5
diff --git a/share/mklocale/ru_RU.CP866.src b/share/mklocale/ru_RU.CP866.src
index 659482b..c4ef1bb 100644
--- a/share/mklocale/ru_RU.CP866.src
+++ b/share/mklocale/ru_RU.CP866.src
@@ -1,5 +1,7 @@
 /*
  * LOCALE_CTYPE for Russian Alternative character set (CP866)
+ *
+ * $FreeBSD$
  */
 ENCODING	"NONE"
 VARIABLE        Russian Alternative charset (CP866) by ache@astral.msk.su
diff --git a/share/mklocale/ru_RU.KOI8-R.src b/share/mklocale/ru_RU.KOI8-R.src
index b9582fe..2fb1aae 100644
--- a/share/mklocale/ru_RU.KOI8-R.src
+++ b/share/mklocale/ru_RU.KOI8-R.src
@@ -1,5 +1,7 @@
 /*
  * LOCALE_CTYPE for Russian koi8-r character set (RFC1489)
+ *
+ * $FreeBSD$
  */
 ENCODING	"NONE"
 VARIABLE        Russian koi8-r character set by ache@astral.msk.su
diff --git a/share/mklocale/ru_SU.CP866.src b/share/mklocale/ru_SU.CP866.src
deleted file mode 100644
index 659482b..0000000
--- a/share/mklocale/ru_SU.CP866.src
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * LOCALE_CTYPE for Russian Alternative character set (CP866)
- */
-ENCODING	"NONE"
-VARIABLE        Russian Alternative charset (CP866) by ache@astral.msk.su
-
-#
-# This is a comment
-#
-ALPHA           'A' - 'Z' 'a' - 'z' 0x80 - 0xaf 0xe0 - 0xf1
-CONTROL		0x00 - 0x1f 0x7f
-DIGIT		'0' - '9'
-GRAPH           0x21 - 0x7e 0x80 - 0xff
-LOWER           'a' - 'z' 0xa0 - 0xaf 0xe0 - 0xef 0xf1
-PUNCT		0x21 - 0x2f 0x3a - 0x40 0x5b - 0x60 0x7b - 0x7e
-SPACE		0x09 - 0x0d 0x20
-UPPER           'A' - 'Z' 0x80 - 0x9f 0xf0
-XDIGIT          '0' - '9' 'a' - 'f' 'A' - 'F'
-BLANK		' ' '\t'
-PRINT		0x20 - 0x7e 0x80 - 0xff
-# IDEOGRAM
-# SPECIAL
-# PHONEGRAM
-
-MAPLOWER       	<'A' - 'Z' : 'a'>
-MAPLOWER       	<'a' - 'z' : 'a'>
-MAPLOWER        <0x80 - 0x8f : 0xa0>
-MAPLOWER        <0x90 - 0x9f : 0xe0>
-MAPLOWER        <0xf0  0xf1>
-MAPLOWER        <0xa0 - 0xaf : 0xa0>
-MAPLOWER        <0xe0 - 0xef : 0xe0>
-MAPLOWER        <0xf1  0xf1>
-MAPUPPER       	<'A' - 'Z' : 'A'>
-MAPUPPER       	<'a' - 'z' : 'A'>
-MAPUPPER        <0x80 - 0x9f : 0x80>
-MAPUPPER        <0xf0  0xf0>
-MAPUPPER        <0xa0 - 0xaf : 0x80>
-MAPUPPER        <0xe0 - 0xef : 0x90>
-MAPUPPER        <0xf1  0xf0>
-TODIGIT       	<'0' - '9' : 0>
-TODIGIT       	<'A' - 'F' : 10>
-TODIGIT       	<'a' - 'f' : 10>
diff --git a/share/mklocale/ru_SU.ISO_8859-5.src b/share/mklocale/ru_SU.ISO_8859-5.src
deleted file mode 100644
index 68b39e7..0000000
--- a/share/mklocale/ru_SU.ISO_8859-5.src
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * LOCALE_CTYPE for Russian part of ISO8859-5 set
- *
- * $FreeBSD$
- */
-
-ENCODING	"NONE"
-VARIABLE        Russian part of ISO8859-5 character set by nms@ethereal.ru
-
-ALPHA		'A' - 'Z' 'a' - 'z' \
-		0xd0 0xd1 0xd2 0xd3 0xd4 0xd5 0xf1 0xd6 \
-		0xd7 0xd8 0xd9 0xda 0xdb 0xdc 0xdd 0xde \
-		0xdf 0xe0 0xe1 0xe2 0xe3 0xe4 0xe5 0xe6 \
-		0xe7 0xe8 0xe9 0xea 0xeb 0xec 0xed 0xee 0xef \
-		0xb0 0xb1 0xb2 0xb3 0xb4 0xb5 0xa1 0xb6 \
-		0xb7 0xb8 0xb9 0xba 0xbb 0xbc 0xbd 0xbe \
-		0xbf 0xc0 0xc1 0xc2 0xc3 0xc4 0xc5 0xc6 \
-		0xc7 0xc8 0xc9 0xca 0xcb 0xcc 0xcd 0xce 0xcf
-BLANK		' ' '\t'
-CONTROL		0x00 - 0x1f 0x7f
-DIGIT		'0' - '9'
-GRAPH		0x21 - 0x7e
-LOWER		'a' - 'z' \
-		0xd0 0xd1 0xd2 0xd3 0xd4 0xd5 0xf1 0xd6 \
-		0xd7 0xd8 0xd9 0xda 0xdb 0xdc 0xdd 0xde \
-		0xdf 0xe0 0xe1 0xe2 0xe3 0xe4 0xe5 0xe6 \
-		0xe7 0xe8 0xe9 0xea 0xeb 0xec 0xed 0xee 0xef
-PRINT		0x20 - 0x7e
-PUNCT		0x21 - 0x2f 0x3a - 0x40 0x5b - 0x60 0x7b - 0x7e
-SPACE		0x09 - 0x0d 0x20
-UPPER		'A' - 'Z' \
-		0xb0 0xb1 0xb2 0xb3 0xb4 0xb5 0xa1 0xb6 \
-		0xb7 0xb8 0xb9 0xba 0xbb 0xbc 0xbd 0xbe \
-		0xbf 0xc0 0xc1 0xc2 0xc3 0xc4 0xc5 0xc6 \
-		0xc7 0xc8 0xc9 0xca 0xcb 0xcc 0xcd 0xce 0xcf
-XDIGIT          '0' - '9' 'a' - 'f' 'A' - 'F'
-
-# IDEOGRAM
-# SPECIAL
-# PHONEGRAM
-
-MAPLOWER       	<'A' - 'Z' : 'a'>
-MAPLOWER       	<'a' - 'z' : 'a'>
-
-MAPLOWER	<0xb0 0xd0>
-MAPLOWER	<0xb1 0xd1>
-MAPLOWER	<0xb2 0xd2>
-MAPLOWER	<0xb3 0xd3>
-MAPLOWER	<0xb4 0xd4>
-MAPLOWER	<0xb5 0xd5>
-MAPLOWER	<0xa1 0xf1>
-MAPLOWER	<0xb6 0xd6>
-MAPLOWER	<0xb7 0xd7>
-MAPLOWER	<0xb8 0xd8>
-MAPLOWER	<0xb9 0xd9>
-MAPLOWER	<0xba 0xda>
-MAPLOWER	<0xbb 0xdb>
-MAPLOWER	<0xbc 0xdc>
-MAPLOWER	<0xbd 0xdd>
-MAPLOWER	<0xbe 0xde>
-MAPLOWER	<0xbf 0xdf>
-MAPLOWER	<0xc0 0xe0>
-MAPLOWER	<0xc1 0xe1>
-MAPLOWER	<0xc2 0xe2>
-MAPLOWER	<0xc3 0xe3>
-MAPLOWER	<0xc4 0xe4>
-MAPLOWER	<0xc5 0xe5>
-MAPLOWER	<0xc6 0xe6>
-MAPLOWER	<0xc7 0xe7>
-MAPLOWER	<0xc8 0xe8>
-MAPLOWER	<0xc9 0xe9>
-MAPLOWER	<0xca 0xea>
-MAPLOWER	<0xcb 0xeb>
-MAPLOWER	<0xcc 0xec>
-MAPLOWER	<0xcd 0xed>
-MAPLOWER	<0xce 0xee>
-MAPLOWER	<0xcf 0xef>
-
-MAPLOWER	<0xd0 0xd0>
-MAPLOWER	<0xd1 0xd1>
-MAPLOWER	<0xd2 0xd2>
-MAPLOWER	<0xd3 0xd3>
-MAPLOWER	<0xd4 0xd4>
-MAPLOWER	<0xd5 0xd5>
-MAPLOWER	<0xf1 0xf1>
-MAPLOWER	<0xd6 0xd6>
-MAPLOWER	<0xd7 0xd7>
-MAPLOWER	<0xd8 0xd8>
-MAPLOWER	<0xd9 0xd9>
-MAPLOWER	<0xda 0xda>
-MAPLOWER	<0xdb 0xdb>
-MAPLOWER	<0xdc 0xdc>
-MAPLOWER	<0xdd 0xdd>
-MAPLOWER	<0xde 0xde>
-MAPLOWER	<0xdf 0xdf>
-MAPLOWER	<0xe0 0xe0>
-MAPLOWER	<0xe1 0xe1>
-MAPLOWER	<0xe2 0xe2>
-MAPLOWER	<0xe3 0xe3>
-MAPLOWER	<0xe4 0xe4>
-MAPLOWER	<0xe5 0xe5>
-MAPLOWER	<0xe6 0xe6>
-MAPLOWER	<0xe7 0xe7>
-MAPLOWER	<0xe8 0xe8>
-MAPLOWER	<0xe9 0xe9>
-MAPLOWER	<0xea 0xea>
-MAPLOWER	<0xeb 0xeb>
-MAPLOWER	<0xec 0xec>
-MAPLOWER	<0xed 0xed>
-MAPLOWER	<0xee 0xee>
-MAPLOWER	<0xef 0xef>
-
-MAPUPPER       	<'A' - 'Z' : 'A'>
-MAPUPPER       	<'a' - 'z' : 'A'>
-
-MAPUPPER	<0xd0 0xb0>
-MAPUPPER	<0xd1 0xb1>
-MAPUPPER	<0xd2 0xb2>
-MAPUPPER	<0xd3 0xb3>
-MAPUPPER	<0xd4 0xb4>
-MAPUPPER	<0xd5 0xb5>
-MAPUPPER	<0xf1 0xa1>
-MAPUPPER	<0xd6 0xb6>
-MAPUPPER	<0xd7 0xb7>
-MAPUPPER	<0xd8 0xb8>
-MAPUPPER	<0xd9 0xb9>
-MAPUPPER	<0xda 0xba>
-MAPUPPER	<0xdb 0xbb>
-MAPUPPER	<0xdc 0xbc>
-MAPUPPER	<0xdd 0xbd>
-MAPUPPER	<0xde 0xbe>
-MAPUPPER	<0xdf 0xbf>
-MAPUPPER	<0xe0 0xc0>
-MAPUPPER	<0xe1 0xc1>
-MAPUPPER	<0xe2 0xc2>
-MAPUPPER	<0xe3 0xc3>
-MAPUPPER	<0xe4 0xc4>
-MAPUPPER	<0xe5 0xc5>
-MAPUPPER	<0xe6 0xc6>
-MAPUPPER	<0xe7 0xc7>
-MAPUPPER	<0xe8 0xc8>
-MAPUPPER	<0xe9 0xc9>
-MAPUPPER	<0xea 0xca>
-MAPUPPER	<0xeb 0xcb>
-MAPUPPER	<0xec 0xcc>
-MAPUPPER	<0xed 0xcd>
-MAPUPPER	<0xee 0xce>
-MAPUPPER	<0xef 0xcf>
-
-MAPUPPER	<0xb0 0xb0>
-MAPUPPER	<0xb1 0xb1>
-MAPUPPER	<0xb2 0xb2>
-MAPUPPER	<0xb3 0xb3>
-MAPUPPER	<0xb4 0xb4>
-MAPUPPER	<0xb5 0xb5>
-MAPUPPER	<0xa1 0xa1>
-MAPUPPER	<0xb6 0xb6>
-MAPUPPER	<0xb7 0xb7>
-MAPUPPER	<0xb8 0xb8>
-MAPUPPER	<0xb9 0xb9>
-MAPUPPER	<0xba 0xba>
-MAPUPPER	<0xbb 0xbb>
-MAPUPPER	<0xbc 0xbc>
-MAPUPPER	<0xbd 0xbd>
-MAPUPPER	<0xbe 0xbe>
-MAPUPPER	<0xbf 0xbf>
-MAPUPPER	<0xc0 0xc0>
-MAPUPPER	<0xc1 0xc1>
-MAPUPPER	<0xc2 0xc2>
-MAPUPPER	<0xc3 0xc3>
-MAPUPPER	<0xc4 0xc4>
-MAPUPPER	<0xc5 0xc5>
-MAPUPPER	<0xc6 0xc6>
-MAPUPPER	<0xc7 0xc7>
-MAPUPPER	<0xc8 0xc8>
-MAPUPPER	<0xc9 0xc9>
-MAPUPPER	<0xca 0xca>
-MAPUPPER	<0xcb 0xcb>
-MAPUPPER	<0xcc 0xcc>
-MAPUPPER	<0xcd 0xcd>
-MAPUPPER	<0xce 0xce>
-MAPUPPER	<0xcf 0xcf>
-
-TODIGIT       	<'0' - '9' : 0>
-TODIGIT       	<'A' - 'F' : 10>
-TODIGIT       	<'a' - 'f' : 10>
diff --git a/share/mklocale/ru_SU.KOI8-R.src b/share/mklocale/ru_SU.KOI8-R.src
deleted file mode 100644
index b9582fe..0000000
--- a/share/mklocale/ru_SU.KOI8-R.src
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * LOCALE_CTYPE for Russian koi8-r character set (RFC1489)
- */
-ENCODING	"NONE"
-VARIABLE        Russian koi8-r character set by ache@astral.msk.su
-
-#
-# This is a comment
-#
-ALPHA		'A' - 'Z' 'a' - 'z' 0xa3 0xb3 0xc0 - 0xff
-CONTROL		0x00 - 0x1f 0x7f
-DIGIT		'0' - '9'
-GRAPH		0x21 - 0x7e 0x80 - 0x99	0x9b - 0xff
-LOWER		'a' - 'z' 0xa3 0xc0 - 0xdf
-PUNCT		0x21 - 0x2f 0x3a - 0x40 0x5b - 0x60 0x7b - 0x7e
-SPACE		0x09 - 0x0d 0x20 0x9a
-UPPER		'A' - 'Z' 0xb3 0xe0 - 0xff
-XDIGIT          '0' - '9' 'a' - 'f' 'A' - 'F'
-BLANK		' ' '\t' 0x9a
-PRINT		0x20 - 0x7e 0x80 - 0xff
-# IDEOGRAM
-# SPECIAL
-# PHONEGRAM
-
-MAPLOWER       	<'A' - 'Z' : 'a'>
-MAPLOWER       	<'a' - 'z' : 'a'>
-MAPLOWER	<0xb3  0xa3>
-MAPLOWER        <0xa3  0xa3>
-MAPLOWER	<0xe0 - 0xff : 0xc0>
-MAPLOWER	<0xc0 - 0xdf : 0xc0>
-MAPUPPER       	<'A' - 'Z' : 'A'>
-MAPUPPER       	<'a' - 'z' : 'A'>
-MAPUPPER        <0xb3  0xb3>
-MAPUPPER	<0xa3  0xb3>
-MAPUPPER	<0xe0 - 0xff : 0xe0>
-MAPUPPER	<0xc0 - 0xdf : 0xe0>
-TODIGIT       	<'0' - '9' : 0>
-TODIGIT       	<'A' - 'F' : 10>
-TODIGIT       	<'a' - 'f' : 10>
diff --git a/share/timedef/Makefile b/share/timedef/Makefile
index ba920f5..e9cc647 100644
--- a/share/timedef/Makefile
+++ b/share/timedef/Makefile
@@ -25,9 +25,9 @@ LOCALES=	cs_CZ.ISO_8859-2 \
 		no_NO.ISO_8859-1 \
 		pl_PL.ISO_8859-2 \
 		pt_PT.ISO_8859-1 \
-		ru_SU.CP866 	 \
-		ru_SU.ISO_8859-5 \
-		ru_SU.KOI8-R     \
+		ru_RU.CP866 	 \
+		ru_RU.ISO_8859-5 \
+		ru_RU.KOI8-R     \
 		sl_SI.ISO_8859-2 \
 		sv_SE.ISO_8859-1 \
 		tr_TR.ISO_8859-9 \
diff --git a/share/timedef/ru_SU.CP866.src b/share/timedef/ru_SU.CP866.src
deleted file mode 100644
index 0c8a181..0000000
--- a/share/timedef/ru_SU.CP866.src
+++ /dev/null
@@ -1,101 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# Short months names
-#
-ï­¢
-䥢
-¬ à
- ¯à
-¬ ©
-¨î­
-¨î«
- ¢£
-ᥭ
-®ªâ
-­®ï
-¤¥ª
-#
-# Long months names
-#
-ï­¢ àï
-䥢ࠫï
-¬ àâ 
- ¯à¥«ï
-¬ ï
-¨î­ï
-¨î«ï
- ¢£ãáâ 
-ᥭâï¡àï
-®ªâï¡àï
-­®ï¡àï
-¤¥ª ¡àï
-#
-# Short weekdays names
-#
-¢á 
-¯­ 
-¢â 
-áà 
-çâ 
-¯â 
-á¡ 
-#
-# Long weekdays names
-#
-¢®áªà¥á¥­ì¥
-¯®­¥¤¥«ì­¨ª
-¢â®à­¨ª
-á। 
-ç¥â¢¥à£
-¯ïâ­¨æ 
-áã¡¡®â 
-#
-# X_fmt
-#
-%H:%M:%S
-#
-# x_fmt
-#
-%d.%m.%y
-#
-# c_fmt
-#
-%a %e %b %X %Y
-#
-# am
-# (two spaces)
-  
-#
-# pm
-#
-¯¯
-#
-# date_fmt
-#
-%a %e %b %Y %X %Z
-#
-# Long month names in alternative form
-#
-ï­¢ àì
-䥢ࠫì
-¬ àâ
- ¯à¥«ì
-¬ ©
-¨î­ì
-¨î«ì
- ¢£ãáâ
-ᥭâï¡àì
-®ªâï¡àì
-­®ï¡àì
-¤¥ª ¡àì
-#
-# Ef_fmt
-#
-%e %b
-#
-# EF_fmt
-#
-%e %B
diff --git a/share/timedef/ru_SU.ISO_8859-5.src b/share/timedef/ru_SU.ISO_8859-5.src
deleted file mode 100644
index e52afaa..0000000
--- a/share/timedef/ru_SU.ISO_8859-5.src
+++ /dev/null
@@ -1,101 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# Short months names
-#
-ïÝÒ
-äÕÒ
-ÜÐà
-Ðßà
-ÜÐÙ
-ØîÝ
-ØîÛ
-ÐÒÓ
-áÕÝ
-ÞÚâ
-ÝÞï
-ÔÕÚ
-#
-# Long months names
-#
-ïÝÒÐàï
-äÕÒàÐÛï
-ÜÐàâÐ
-ÐßàÕÛï
-ÜÐï
-ØîÝï
-ØîÛï
-ÐÒÓãáâÐ
-áÕÝâïÑàï
-ÞÚâïÑàï
-ÝÞïÑàï
-ÔÕÚÐÑàï
-#
-# Short weekdays names
-#
-Òá 
-ßÝ 
-Òâ 
-áà 
-çâ 
-ßâ 
-áÑ 
-#
-# Long weekdays names
-#
-ÒÞáÚàÕáÕÝìÕ
-ßÞÝÕÔÕÛìÝØÚ
-ÒâÞàÝØÚ
-áàÕÔÐ
-çÕâÒÕàÓ
-ßïâÝØæÐ
-áãÑÑÞâÐ
-#
-# X_fmt
-#
-%H:%M:%S
-#
-# x_fmt
-#
-%d.%m.%y
-#
-# c_fmt
-#
-%a %e %b %X %Y
-#
-# am
-# (two spaces)
-  
-#
-# pm
-#
-ßß
-#
-# date_fmt
-#
-%a %e %b %Y %X %Z
-#
-# Long month names in alternative form
-#
-ïÝÒÐàì
-äÕÒàÐÛì
-ÜÐàâ
-ÐßàÕÛì
-ÜÐÙ
-ØîÝì
-ØîÛì
-ÐÒÓãáâ
-áÕÝâïÑàì
-ÞÚâïÑàì
-ÝÞïÑàì
-ÔÕÚÐÑàì
-#
-# Ef_fmt
-#
-%e %b
-#
-# EF_fmt
-#
-%e %B
diff --git a/share/timedef/ru_SU.KOI8-R.src b/share/timedef/ru_SU.KOI8-R.src
deleted file mode 100644
index bce56a3..0000000
--- a/share/timedef/ru_SU.KOI8-R.src
+++ /dev/null
@@ -1,101 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# Short months names
-#
-ÑÎ×
-ÆÅ×
-ÍÁÒ
-ÁÐÒ
-ÍÁÊ
-ÉÀÎ
-ÉÀÌ
-Á×Ç
-ÓÅÎ
-ÏËÔ
-ÎÏÑ
-ÄÅË
-#
-# Long months names
-#
-ÑÎ×ÁÒÑ
-ÆÅ×ÒÁÌÑ
-ÍÁÒÔÁ
-ÁÐÒÅÌÑ
-ÍÁÑ
-ÉÀÎÑ
-ÉÀÌÑ
-Á×ÇÕÓÔÁ
-ÓÅÎÔÑÂÒÑ
-ÏËÔÑÂÒÑ
-ÎÏÑÂÒÑ
-ÄÅËÁÂÒÑ
-#
-# Short weekdays names
-#
-×Ó 
-ÐÎ 
-×Ô 
-ÓÒ 
-ÞÔ 
-ÐÔ 
-ÓÂ 
-#
-# Long weekdays names
-#
-×ÏÓËÒÅÓÅÎØÅ
-ÐÏÎÅÄÅÌØÎÉË
-×ÔÏÒÎÉË
-ÓÒÅÄÁ
-ÞÅÔ×ÅÒÇ
-ÐÑÔÎÉÃÁ
-ÓÕÂÂÏÔÁ
-#
-# X_fmt
-#
-%H:%M:%S
-#
-# x_fmt
-#
-%d.%m.%y
-#
-# c_fmt
-#
-%a %e %b %X %Y
-#
-# am
-# (two spaces)
-  
-#
-# pm
-#
-ÐÐ
-#
-# date_fmt
-#
-%a %e %b %Y %X %Z
-#
-# Long month names in alternative form
-#
-ÑÎ×ÁÒØ
-ÆÅ×ÒÁÌØ
-ÍÁÒÔ
-ÁÐÒÅÌØ
-ÍÁÊ
-ÉÀÎØ
-ÉÀÌØ
-Á×ÇÕÓÔ
-ÓÅÎÔÑÂÒØ
-ÏËÔÑÂÒØ
-ÎÏÑÂÒØ
-ÄÅËÁÂÒØ
-#
-# Ef_fmt
-#
-%e %b
-#
-# EF_fmt
-#
-%e %B