Attempt to fix the century-old problems with those fonts wrt Russian letters

..     ..
e  and E: in two fonts those letters were mapped to a different chars than
specified by koi8-r standard, while in another one they were completely
absent. Bump PORTREVISION.

While being here, note that the fonts aren't quite `Cyrillic' -
they all miss letters found in cyrillic languages other than Russian
particularly all letters specific for Ukrainian language.

61 files changed, 4267 insertions, 0 deletions

diff --git a/x11-fonts/XFree86-4-fontCyrillic/Makefile b/x11-fonts/XFree86-4-fontCyrillic/Makefile
index 8ebb6ed710b0..8661ce878c18 100644
--- a/x11-fonts/XFree86-4-fontCyrillic/Makefile
+++ b/x11-fonts/XFree86-4-fontCyrillic/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fontCyrillic
 PORTVERSION=	4.2.0
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1c.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1c.bdf
new file mode 100644
index 000000000000..7e62e3043910
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1c.bdf
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- crox1c.bdf	2002/08/25 11:02:05	1.1
++++ crox1c.bdf	2002/08/25 11:10:50
+@@ -2615,7 +2615,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 615 0
+ DWIDTH 8 0
+ BBX 8 13 0 -2
+@@ -2655,7 +2655,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 615 0
+ DWIDTH 8 0
+ BBX 8 13 0 -2
+@@ -2975,7 +2975,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 615 0
+ DWIDTH 8 0
+ BBX 8 13 0 -2
+@@ -3215,7 +3215,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 615 0
+ DWIDTH 8 0
+ BBX 8 13 0 -2
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1cb.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1cb.bdf
new file mode 100644
index 000000000000..b7faca8b9720
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1cb.bdf
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- crox1cb.bdf	2002/08/25 11:02:05	1.1
++++ crox1cb.bdf	2002/08/25 11:10:50
+@@ -2615,7 +2615,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 692 0
+ DWIDTH 9 0
+ BBX 9 13 0 -2
+@@ -2655,7 +2655,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 692 0
+ DWIDTH 9 0
+ BBX 9 13 0 -2
+@@ -2975,7 +2975,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 692 0
+ DWIDTH 9 0
+ BBX 9 13 0 -2
+@@ -3215,7 +3215,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 692 0
+ DWIDTH 9 0
+ BBX 9 13 0 -2
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1cbo.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1cbo.bdf
new file mode 100644
index 000000000000..977fbe302867
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1cbo.bdf
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- crox1cbo.bdf	2002/08/25 11:02:05	1.1
++++ crox1cbo.bdf	2002/08/25 11:10:50
+@@ -2615,7 +2615,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 692 0
+ DWIDTH 9 0
+ BBX 13 13 -1 -2
+@@ -2655,7 +2655,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 692 0
+ DWIDTH 9 0
+ BBX 13 13 -1 -2
+@@ -2975,7 +2975,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 692 0
+ DWIDTH 9 0
+ BBX 13 13 -1 -2
+@@ -3215,7 +3215,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 692 0
+ DWIDTH 9 0
+ BBX 13 13 -1 -2
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1co.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1co.bdf
new file mode 100644
index 000000000000..35bd4a4972d4
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1co.bdf
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- crox1co.bdf	2002/08/25 11:02:05	1.1
++++ crox1co.bdf	2002/08/25 11:10:50
+@@ -2615,7 +2615,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 615 0
+ DWIDTH 8 0
+ BBX 12 13 -1 -2
+@@ -2655,7 +2655,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 615 0
+ DWIDTH 8 0
+ BBX 12 13 -1 -2
+@@ -2975,7 +2975,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 615 0
+ DWIDTH 8 0
+ BBX 12 13 -1 -2
+@@ -3215,7 +3215,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 615 0
+ DWIDTH 8 0
+ BBX 12 13 -1 -2
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1h.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1h.bdf
new file mode 100644
index 000000000000..17d093acb5cc
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1h.bdf
@@ -0,0 +1,81 @@
+
+$FreeBSD$
+
+--- crox1h.bdf	2002/08/26 18:16:12	1.1
++++ crox1h.bdf	2002/08/26 20:49:20
+@@ -2654,25 +2654,20 @@
+ 20
+ 00
+ ENDCHAR
+-STARTCHAR sterling
++STARTCHAR cyr-ie
+ ENCODING 163
+-SWIDTH 461 0
+-DWIDTH 6 0
+-BBX 6 13 0 -2
++SWIDTH 468 0
++DWIDTH 5 0
++BBX 5 8 1 0
+ BITMAP
++50
+ 00
+-00
+-30
+-48
+-40
+-20
+ 70
+-20
+-40
+-40
+-7c
+-00
+-00
++88
++F8
++80
++88
++70
+ ENDCHAR
+ STARTCHAR currency
+ ENCODING 164
+@@ -2974,25 +2969,23 @@
+ 00
+ 00
+ ENDCHAR
+-STARTCHAR threesuperior
++STARTCHAR cyr-Ie
+ ENCODING 179
+-SWIDTH 230 0
+-DWIDTH 3 0
+-BBX 3 13 0 -2
++SWIDTH 468 0
++DWIDTH 5 0
++BBX 5 11 1 0
+ BITMAP
++D8
+ 00
+-00
+-c0
+-20
+-40
+-20
+-c0
+-00
+-00
+-00
+-00
+-00
+-00
++F8
++80
++80
++80
++F0
++80
++80
++80
++F8
+ ENDCHAR
+ STARTCHAR acute
+ ENCODING 180
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1hb.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1hb.bdf
new file mode 100644
index 000000000000..0b83f0346af6
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1hb.bdf
@@ -0,0 +1,81 @@
+
+$FreeBSD$
+
+--- crox1hb.bdf	2002/08/26 18:16:12	1.1
++++ crox1hb.bdf	2002/08/26 20:49:21
+@@ -2654,25 +2654,20 @@
+ 30
+ 00
+ ENDCHAR
+-STARTCHAR sterling
++STARTCHAR cyr-ie
+ ENCODING 163
+-SWIDTH 538 0
+-DWIDTH 7 0
+-BBX 7 13 0 -2
++SWIDTH 562 0
++DWIDTH 6 0
++BBX 6 8 1 0
+ BITMAP
++48
+ 00
+-00
+-38
+-6C
+-60
+-30
+ 78
+-30
+-60
+-60
+-7E
+-00
+-00
++CC
++FC
++C0
++CC
++78
+ ENDCHAR
+ STARTCHAR currency
+ ENCODING 164
+@@ -2974,25 +2969,23 @@
+ 00
+ 00
+ ENDCHAR
+-STARTCHAR threesuperior
++STARTCHAR cyr-Ie
+ ENCODING 179
+-SWIDTH 307 0
+-DWIDTH 4 0
+-BBX 4 13 0 -2
++SWIDTH 562 0
++DWIDTH 6 0
++BBX 6 11 1 0
+ BITMAP
++CC
+ 00
+-00
+-E0
+-30
+-60
+-30
+-E0
+-00
+-00
+-00
+-00
+-00
+-00
++FC
++C0
++C0
++C0
++F8
++C0
++C0
++C0
++FC
+ ENDCHAR
+ STARTCHAR acute
+ ENCODING 180
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1hbo.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1hbo.bdf
new file mode 100644
index 000000000000..77c11510eded
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1hbo.bdf
@@ -0,0 +1,84 @@
+
+$FreeBSD$
+
+--- crox1hbo.bdf	2002/08/26 18:16:12	1.1
++++ crox1hbo.bdf	2002/08/26 20:49:21
+@@ -2654,25 +2654,20 @@
+ 1800
+ 0000
+ ENDCHAR
+-STARTCHAR sterling
++STARTCHAR cyr-ie
+ ENCODING 163
+-SWIDTH 538 0
+-DWIDTH 7 0
+-BBX 11 13 -1 -2
++SWIDTH 281 0
++DWIDTH 3 0
++BBX 7 8 2 0
+ BITMAP
+-0000
+-0000
+-0380
+-06C0
+-0C00
+-0600
+-0F00
+-0C00
+-1800
+-1800
+-3F00
+-0000
+-0000
++12
++00
++3C
++66
++FC
++C0
++CC
++F0
+ ENDCHAR
+ STARTCHAR currency
+ ENCODING 164
+@@ -2974,25 +2969,23 @@
+ 00
+ 00
+ ENDCHAR
+-STARTCHAR threesuperior
++STARTCHAR cyr-Ie
+ ENCODING 179
+-SWIDTH 307 0
+-DWIDTH 4 0
+-BBX 8 13 -1 -2
++SWIDTH 1031 0
++DWIDTH 11 0
++BBX 10 11 1 0
+ BITMAP
+-00
+-00
+-0E
+-03
+-0C
+-06
+-1C
+-00
+-00
+-00
+-00
+-00
+-00
++0CC0
++0000
++1F80
++1800
++3000
++3000
++3E00
++6000
++6000
++6000
++FC00
+ ENDCHAR
+ STARTCHAR acute
+ ENCODING 180
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1ho.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1ho.bdf
new file mode 100644
index 000000000000..8658209e09a2
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1ho.bdf
@@ -0,0 +1,84 @@
+
+$FreeBSD$
+
+--- crox1ho.bdf	2002/08/26 18:16:12	1.1
++++ crox1ho.bdf	2002/08/26 20:49:22
+@@ -2654,25 +2654,20 @@
+ 1000
+ 0000
+ ENDCHAR
+-STARTCHAR sterling
++STARTCHAR cyr-ie
+ ENCODING 163
+-SWIDTH 461 0
+-DWIDTH 6 0
+-BBX 10 13 -1 -2
++SWIDTH 750 0
++DWIDTH 8 0
++BBX 6 8 2 0
+ BITMAP
+-0000
+-0000
+-0300
+-0480
+-0800
+-0400
+-0E00
+-0800
+-1000
+-1000
+-3E00
+-0000
+-0000
++14
++00
++38
++44
++F8
++80
++88
++E0
+ ENDCHAR
+ STARTCHAR currency
+ ENCODING 164
+@@ -2974,25 +2969,23 @@
+ 00
+ 00
+ ENDCHAR
+-STARTCHAR threesuperior
++STARTCHAR cyr-Ie
+ ENCODING 179
+-SWIDTH 230 0
+-DWIDTH 3 0
+-BBX 7 13 -1 -2
++SWIDTH 937 0
++DWIDTH 10 0
++BBX 9 11 1 0
+ BITMAP
+-00
+-00
+-0C
+-02
+-08
+-04
+-18
+-00
+-00
+-00
+-00
+-00
+-00
++0D80
++0000
++1F00
++1000
++2000
++2000
++3C00
++4000
++4000
++4000
++F800
+ ENDCHAR
+ STARTCHAR acute
+ ENCODING 180
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1t.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1t.bdf
new file mode 100644
index 000000000000..3e864c21f825
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1t.bdf
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- crox1t.bdf	2002/08/25 11:02:05	1.1
++++ crox1t.bdf	2002/08/25 11:10:50
+@@ -2615,7 +2615,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 615 0
+ DWIDTH 8 0
+ BBX 8 13 0 -2
+@@ -2655,7 +2655,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 384 0
+ DWIDTH 5 0
+ BBX 5 13 0 -2
+@@ -2975,7 +2975,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 230 0
+ DWIDTH 3 0
+ BBX 3 13 0 -2
+@@ -3215,7 +3215,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 384 0
+ DWIDTH 5 0
+ BBX 5 13 0 -2
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1tb.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1tb.bdf
new file mode 100644
index 000000000000..fc3b6419edd1
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1tb.bdf
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- crox1tb.bdf	2002/08/25 11:02:05	1.1
++++ crox1tb.bdf	2002/08/25 11:10:50
+@@ -2615,7 +2615,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 692 0
+ DWIDTH 9 0
+ BBX 9 13 0 -2
+@@ -2655,7 +2655,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 461 0
+ DWIDTH 6 0
+ BBX 6 13 0 -2
+@@ -2975,7 +2975,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 307 0
+ DWIDTH 4 0
+ BBX 4 13 0 -2
+@@ -3215,7 +3215,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 461 0
+ DWIDTH 6 0
+ BBX 6 13 0 -2
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1tbo.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1tbo.bdf
new file mode 100644
index 000000000000..0c4cf2bae686
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1tbo.bdf
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- crox1tbo.bdf	2002/08/25 11:02:05	1.1
++++ crox1tbo.bdf	2002/08/25 11:10:51
+@@ -2615,7 +2615,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 692 0
+ DWIDTH 9 0
+ BBX 13 13 -1 -2
+@@ -2655,7 +2655,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 461 0
+ DWIDTH 6 0
+ BBX 10 13 -1 -2
+@@ -2975,7 +2975,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 307 0
+ DWIDTH 4 0
+ BBX 8 13 -1 -2
+@@ -3215,7 +3215,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 461 0
+ DWIDTH 6 0
+ BBX 10 13 -1 -2
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1to.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1to.bdf
new file mode 100644
index 000000000000..830f9ec9ba47
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox1to.bdf
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- crox1to.bdf	2002/08/25 11:02:05	1.1
++++ crox1to.bdf	2002/08/25 11:10:51
+@@ -2615,7 +2615,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 615 0
+ DWIDTH 8 0
+ BBX 12 13 -1 -2
+@@ -2655,7 +2655,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 384 0
+ DWIDTH 5 0
+ BBX 9 13 -1 -2
+@@ -2975,7 +2975,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 230 0
+ DWIDTH 3 0
+ BBX 7 13 -1 -2
+@@ -3215,7 +3215,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 384 0
+ DWIDTH 5 0
+ BBX 9 13 -1 -2
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2c.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2c.bdf
new file mode 100644
index 000000000000..31f1cd84165d
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2c.bdf
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- crox2c.bdf	2002/08/25 11:02:05	1.1
++++ crox2c.bdf	2002/08/25 11:10:51
+@@ -3002,7 +3002,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 562 0
+ DWIDTH 9 0
+ BBX 9 16 0 -3
+@@ -3048,7 +3048,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 562 0
+ DWIDTH 9 0
+ BBX 9 16 0 -3
+@@ -3416,7 +3416,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 562 0
+ DWIDTH 9 0
+ BBX 9 16 0 -3
+@@ -3692,7 +3692,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 562 0
+ DWIDTH 9 0
+ BBX 9 16 0 -3
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2cb.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2cb.bdf
new file mode 100644
index 000000000000..ce0f6a53307d
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2cb.bdf
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- crox2cb.bdf	2002/08/25 11:02:05	1.1
++++ crox2cb.bdf	2002/08/25 11:10:51
+@@ -3002,7 +3002,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 625 0
+ DWIDTH 10 0
+ BBX 10 16 0 -3
+@@ -3048,7 +3048,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 625 0
+ DWIDTH 10 0
+ BBX 10 16 0 -3
+@@ -3416,7 +3416,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 625 0
+ DWIDTH 10 0
+ BBX 10 16 0 -3
+@@ -3692,7 +3692,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 625 0
+ DWIDTH 10 0
+ BBX 10 16 0 -3
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2cbo.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2cbo.bdf
new file mode 100644
index 000000000000..5c3da30fc3fd
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2cbo.bdf
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- crox2cbo.bdf	2002/08/25 11:02:05	1.1
++++ crox2cbo.bdf	2002/08/25 11:10:51
+@@ -3002,7 +3002,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 625 0
+ DWIDTH 10 0
+ BBX 15 16 -1 -3
+@@ -3048,7 +3048,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 625 0
+ DWIDTH 10 0
+ BBX 15 16 -1 -3
+@@ -3416,7 +3416,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 625 0
+ DWIDTH 10 0
+ BBX 15 16 -1 -3
+@@ -3692,7 +3692,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 625 0
+ DWIDTH 10 0
+ BBX 15 16 -1 -3
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2co.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2co.bdf
new file mode 100644
index 000000000000..8f3b984fd8e7
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2co.bdf
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- crox2co.bdf	2002/08/25 11:02:05	1.1
++++ crox2co.bdf	2002/08/25 11:10:51
+@@ -3002,7 +3002,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 562 0
+ DWIDTH 9 0
+ BBX 14 16 -1 -3
+@@ -3048,7 +3048,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 562 0
+ DWIDTH 9 0
+ BBX 14 16 -1 -3
+@@ -3416,7 +3416,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 562 0
+ DWIDTH 9 0
+ BBX 14 16 -1 -3
+@@ -3692,7 +3692,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 562 0
+ DWIDTH 9 0
+ BBX 14 16 -1 -3
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2h.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2h.bdf
new file mode 100644
index 000000000000..9e1dcb9a6fab
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2h.bdf
@@ -0,0 +1,89 @@
+
+$FreeBSD$
+
+--- crox2h.bdf	2002/08/26 18:16:12	1.1
++++ crox2h.bdf	2002/08/26 20:49:22
+@@ -3047,28 +3047,21 @@
+ 00
+ 00
+ ENDCHAR
+-STARTCHAR sterling
++STARTCHAR cyr-ie
+ ENCODING 163
+-SWIDTH 437 0
+-DWIDTH 7 0
+-BBX 7 16 0 -3
++SWIDTH 450 0
++DWIDTH 6 0
++BBX 6 9 1 0
+ BITMAP
+-00
+-00
+-00
+-30
+ 48
+-40
+-40
+-20
+-78
+-20
+-20
+-40
+-7c
+-00
+-00
+ 00
++78
++84
++84
++FC
++80
++84
++78
+ ENDCHAR
+ STARTCHAR currency
+ ENCODING 164
+@@ -3415,28 +3408,24 @@
+ 00
+ 00
+ ENDCHAR
+-STARTCHAR threesuperior
++STARTCHAR cyr-Ie
+ ENCODING 179
+-SWIDTH 250 0
+-DWIDTH 4 0
+-BBX 4 16 0 -3
++SWIDTH 600 0
++DWIDTH 8 0
++BBX 7 12 1 0
+ BITMAP
++C6
+ 00
+-00
+-00
+-60
+-90
+-20
+-90
+-60
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
++FE
++80
++80
++80
++FC
++80
++80
++80
++80
++FE
+ ENDCHAR
+ STARTCHAR acute
+ ENCODING 180
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2hb.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2hb.bdf
new file mode 100644
index 000000000000..90b256b54247
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2hb.bdf
@@ -0,0 +1,89 @@
+
+$FreeBSD$
+
+--- crox2hb.bdf	2002/08/26 18:16:12	1.1
++++ crox2hb.bdf	2002/08/26 20:49:23
+@@ -3047,28 +3047,21 @@
+ 00
+ 00
+ ENDCHAR
+-STARTCHAR sterling
++STARTCHAR cyr-ie
+ ENCODING 163
+-SWIDTH 500 0
+-DWIDTH 8 0
+-BBX 8 16 0 -3
++SWIDTH 525 0
++DWIDTH 7 0
++BBX 7 9 1 0
+ BITMAP
+-00
+-00
+-00
+-38
+ 6C
+-60
+-60
+-30
+-7C
+-30
+-30
+-60
+-7E
+-00
+-00
+ 00
++7C
++C6
++C6
++FE
++C0
++C6
++7C
+ ENDCHAR
+ STARTCHAR currency
+ ENCODING 164
+@@ -3415,28 +3408,24 @@
+ 00
+ 00
+ ENDCHAR
+-STARTCHAR threesuperior
++STARTCHAR cyr-Ie
+ ENCODING 179
+-SWIDTH 312 0
+-DWIDTH 5 0
+-BBX 5 16 0 -3
++SWIDTH 600 0
++DWIDTH 8 0
++BBX 8 12 1 0
+ BITMAP
++C3
+ 00
+-00
+-00
+-70
+-98
+-30
+-98
+-70
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
++FF
++C0
++C0
++C0
++FE
++C0
++C0
++C0
++C0
++FF
+ ENDCHAR
+ STARTCHAR acute
+ ENCODING 180
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2hbo.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2hbo.bdf
new file mode 100644
index 000000000000..24c2cccae387
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2hbo.bdf
@@ -0,0 +1,90 @@
+
+$FreeBSD$
+
+--- crox2hbo.bdf	2002/08/26 18:16:12	1.1
++++ crox2hbo.bdf	2002/08/26 20:49:23
+@@ -3047,28 +3047,21 @@
+ 0000
+ 0000
+ ENDCHAR
+-STARTCHAR sterling
++STARTCHAR cyr-ie
+ ENCODING 163
+-SWIDTH 500 0
+-DWIDTH 8 0
+-BBX 13 16 -1 -3
++SWIDTH 825 0
++DWIDTH 11 0
++BBX 9 9 2 0
+ BITMAP
++1980
+ 0000
+-0000
+-0000
+-01C0
+-06C0
+-0600
+-0600
+-0600
+-0F80
+-0600
+-0C00
+-1800
+-1F80
+-0000
+-0000
+-0000
++1F00
++6300
++6300
++7F00
++C000
++C600
++7C00
+ ENDCHAR
+ STARTCHAR currency
+ ENCODING 164
+@@ -3415,28 +3408,24 @@
+ 0000
+ 0000
+ ENDCHAR
+-STARTCHAR threesuperior
++STARTCHAR cyr-Ie
+ ENCODING 179
+-SWIDTH 312 0
+-DWIDTH 5 0
+-BBX 10 16 -1 -3
++SWIDTH 975 0
++DWIDTH 13 0
++BBX 11 12 2 0
+ BITMAP
++0C60
+ 0000
+-0000
+-0000
+-0380
+-0980
+-0300
+-0980
+-0E00
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
++1FE0
++3000
++3000
++3000
++7F00
++6000
++6000
++C000
++C000
++FF00
+ ENDCHAR
+ STARTCHAR acute
+ ENCODING 180
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2ho.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2ho.bdf
new file mode 100644
index 000000000000..e0c7bd397ff6
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2ho.bdf
@@ -0,0 +1,91 @@
+
+$FreeBSD$
+
+--- crox2ho.bdf	2002/08/26 18:16:12	1.1
++++ crox2ho.bdf	2002/08/26 20:49:24
+@@ -3047,28 +3047,21 @@
+ 0000
+ 0000
+ ENDCHAR
+-STARTCHAR sterling
++STARTCHAR cyr-ie
+ ENCODING 163
+-SWIDTH 437 0
+-DWIDTH 7 0
+-BBX 12 16 -1 -3
++SWIDTH 750 0
++DWIDTH 10 0
++BBX 8 9 2 0
+ BITMAP
+-0000
+-0000
+-0000
+-0180
+-0480
+-0400
+-0400
+-0400
+-0F00
+-0400
+-0800
+-1000
+-1F00
+-0000
+-0000
+-0000
++33
++00
++1E
++42
++42
++7E
++80
++84
++78
+ ENDCHAR
+ STARTCHAR currency
+ ENCODING 164
+@@ -3415,28 +3408,24 @@
+ 0000
+ 0000
+ ENDCHAR
+-STARTCHAR threesuperior
++STARTCHAR cyr-Ie
+ ENCODING 179
+-SWIDTH 250 0
+-DWIDTH 4 0
+-BBX 9 16 -1 -3
++SWIDTH 375 0
++DWIDTH 5 0
++BBX 10 12 2 0
+ BITMAP
++18C0
+ 0000
+-0000
+-0000
+-0300
+-0900
+-0200
+-0900
+-0C00
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
++1FC0
++2000
++2000
++2000
++7E00
++4000
++4000
++8000
++8000
++FE00
+ ENDCHAR
+ STARTCHAR acute
+ ENCODING 180
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2t.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2t.bdf
new file mode 100644
index 000000000000..9d141d75572f
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2t.bdf
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- crox2t.bdf	2002/08/25 11:02:05	1.1
++++ crox2t.bdf	2002/08/25 11:10:51
+@@ -3002,7 +3002,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 500 0
+ DWIDTH 8 0
+ BBX 8 16 0 -3
+@@ -3048,7 +3048,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 375 0
+ DWIDTH 6 0
+ BBX 6 16 0 -3
+@@ -3416,7 +3416,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 187 0
+ DWIDTH 3 0
+ BBX 3 16 0 -3
+@@ -3692,7 +3692,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 437 0
+ DWIDTH 7 0
+ BBX 7 16 0 -3
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2tb.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2tb.bdf
new file mode 100644
index 000000000000..f1844b3b6c3b
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2tb.bdf
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- crox2tb.bdf	2002/08/25 11:02:05	1.1
++++ crox2tb.bdf	2002/08/25 11:10:51
+@@ -3002,7 +3002,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 562 0
+ DWIDTH 9 0
+ BBX 9 16 0 -3
+@@ -3048,7 +3048,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 437 0
+ DWIDTH 7 0
+ BBX 7 16 0 -3
+@@ -3416,7 +3416,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 250 0
+ DWIDTH 4 0
+ BBX 4 16 0 -3
+@@ -3692,7 +3692,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 500 0
+ DWIDTH 8 0
+ BBX 8 16 0 -3
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2tbo.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2tbo.bdf
new file mode 100644
index 000000000000..b1793ce8c48c
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2tbo.bdf
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- crox2tbo.bdf	2002/08/25 11:02:05	1.1
++++ crox2tbo.bdf	2002/08/25 11:10:51
+@@ -3002,7 +3002,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 562 0
+ DWIDTH 9 0
+ BBX 14 16 -1 -3
+@@ -3048,7 +3048,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 437 0
+ DWIDTH 7 0
+ BBX 12 16 -1 -3
+@@ -3416,7 +3416,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 250 0
+ DWIDTH 4 0
+ BBX 9 16 -1 -3
+@@ -3692,7 +3692,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 500 0
+ DWIDTH 8 0
+ BBX 13 16 -1 -3
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2to.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2to.bdf
new file mode 100644
index 000000000000..2d2ad3a4f35b
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox2to.bdf
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- crox2to.bdf	2002/08/25 11:02:05	1.1
++++ crox2to.bdf	2002/08/25 11:10:51
+@@ -3002,7 +3002,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 500 0
+ DWIDTH 8 0
+ BBX 13 16 -1 -3
+@@ -3048,7 +3048,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 375 0
+ DWIDTH 6 0
+ BBX 11 16 -1 -3
+@@ -3416,7 +3416,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 187 0
+ DWIDTH 3 0
+ BBX 8 16 -1 -3
+@@ -3692,7 +3692,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 437 0
+ DWIDTH 7 0
+ BBX 12 16 -1 -3
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3c.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3c.bdf
new file mode 100644
index 000000000000..460bbc659eb2
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3c.bdf
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- crox3c.bdf	2002/08/25 11:02:05	1.1
++++ crox3c.bdf	2002/08/25 11:10:51
+@@ -3518,7 +3518,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 600 0
+ DWIDTH 12 0
+ BBX 12 20 0 -4
+@@ -3572,7 +3572,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 600 0
+ DWIDTH 12 0
+ BBX 12 20 0 -4
+@@ -4004,7 +4004,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 600 0
+ DWIDTH 12 0
+ BBX 12 20 0 -4
+@@ -4328,7 +4328,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 600 0
+ DWIDTH 12 0
+ BBX 12 20 0 -4
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3cb.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3cb.bdf
new file mode 100644
index 000000000000..a359ca008ac1
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3cb.bdf
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- crox3cb.bdf	2002/08/25 11:02:05	1.1
++++ crox3cb.bdf	2002/08/25 11:10:51
+@@ -3518,7 +3518,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 650 0
+ DWIDTH 13 0
+ BBX 13 20 0 -4
+@@ -3572,7 +3572,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 650 0
+ DWIDTH 13 0
+ BBX 13 20 0 -4
+@@ -4004,7 +4004,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 650 0
+ DWIDTH 13 0
+ BBX 13 20 0 -4
+@@ -4328,7 +4328,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 650 0
+ DWIDTH 13 0
+ BBX 13 20 0 -4
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3cbo.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3cbo.bdf
new file mode 100644
index 000000000000..d8e7ac55c48e
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3cbo.bdf
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- crox3cbo.bdf	2002/08/25 11:02:05	1.1
++++ crox3cbo.bdf	2002/08/25 11:10:51
+@@ -3518,7 +3518,7 @@
+ 000000
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 650 0
+ DWIDTH 13 0
+ BBX 19 20 -1 -4
+@@ -3572,7 +3572,7 @@
+ 000000
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 650 0
+ DWIDTH 13 0
+ BBX 19 20 -1 -4
+@@ -4004,7 +4004,7 @@
+ 000000
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 650 0
+ DWIDTH 13 0
+ BBX 19 20 -1 -4
+@@ -4328,7 +4328,7 @@
+ 000000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 650 0
+ DWIDTH 13 0
+ BBX 19 20 -1 -4
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3co.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3co.bdf
new file mode 100644
index 000000000000..e5e7d82fc142
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3co.bdf
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- crox3co.bdf	2002/08/25 11:02:05	1.1
++++ crox3co.bdf	2002/08/25 11:10:51
+@@ -3518,7 +3518,7 @@
+ 000000
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 600 0
+ DWIDTH 12 0
+ BBX 18 20 -1 -4
+@@ -3572,7 +3572,7 @@
+ 000000
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 600 0
+ DWIDTH 12 0
+ BBX 18 20 -1 -4
+@@ -4004,7 +4004,7 @@
+ 000000
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 600 0
+ DWIDTH 12 0
+ BBX 18 20 -1 -4
+@@ -4328,7 +4328,7 @@
+ 000000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 600 0
+ DWIDTH 12 0
+ BBX 18 20 -1 -4
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3h.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3h.bdf
new file mode 100644
index 000000000000..0c7d3ea108e1
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3h.bdf
@@ -0,0 +1,103 @@
+
+$FreeBSD$
+
+--- crox3h.bdf	2002/08/26 18:16:12	1.1
++++ crox3h.bdf	2002/08/26 20:49:25
+@@ -3571,32 +3571,23 @@
+ 0000
+ 0000
+ ENDCHAR
+-STARTCHAR sterling
++STARTCHAR cyr-ie
+ ENCODING 163
+-SWIDTH 450 0
+-DWIDTH 9 0
+-BBX 9 20 0 -4
++SWIDTH 437 0
++DWIDTH 7 0
++BBX 7 11 1 0
+ BITMAP
+-0000
+-0000
+-0000
+-0000
+-1c00
+-2200
+-2200
+-2000
+-1000
+-7e00
+-1000
+-1000
+-1000
+-2000
+-2000
+-7f00
+-0000
+-0000
+-0000
+-0000
++6C
++00
++38
++44
++82
++82
++FE
++80
++82
++44
++38
+ ENDCHAR
+ STARTCHAR currency
+ ENCODING 164
+@@ -4003,32 +3994,26 @@
+ 00
+ 00
+ ENDCHAR
+-STARTCHAR threesuperior
++STARTCHAR cyr-Ie
+ ENCODING 179
+-SWIDTH 250 0
+-DWIDTH 5 0
+-BBX 5 20 0 -4
++SWIDTH 500 0
++DWIDTH 8 0
++BBX 8 14 2 0
+ BITMAP
++66
+ 00
+-00
+-00
+-00
+-30
+-48
+-10
+-08
+-48
+-30
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
++FF
++80
++80
++80
++80
++FE
++80
++80
++80
++80
++80
++FF
+ ENDCHAR
+ STARTCHAR acute
+ ENCODING 180
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3hb.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3hb.bdf
new file mode 100644
index 000000000000..cbb8ece86994
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3hb.bdf
@@ -0,0 +1,103 @@
+
+$FreeBSD$
+
+--- crox3hb.bdf	2002/08/26 18:16:12	1.1
++++ crox3hb.bdf	2002/08/26 20:49:25
+@@ -3571,32 +3571,23 @@
+ 0000
+ 0000
+ ENDCHAR
+-STARTCHAR sterling
++STARTCHAR cyr-ie
+ ENCODING 163
+ SWIDTH 500 0
+-DWIDTH 10 0
+-BBX 10 20 0 -4
++DWIDTH 8 0
++BBX 8 11 1 0
+ BITMAP
+-0000
+-0000
+-0000
+-0000
+-1E00
+-3300
+-3300
+-3000
+-1800
+-7F00
+-1800
+-1800
+-1800
+-3000
+-3000
+-7F80
+-0000
+-0000
+-0000
+-0000
++66
++00
++3C
++66
++C3
++C3
++FF
++C0
++C3
++66
++3C
+ ENDCHAR
+ STARTCHAR currency
+ ENCODING 164
+@@ -4003,32 +3994,26 @@
+ 00
+ 00
+ ENDCHAR
+-STARTCHAR threesuperior
++STARTCHAR cyr-Ie
+ ENCODING 179
+-SWIDTH 300 0
+-DWIDTH 6 0
+-BBX 6 20 0 -4
++SWIDTH 562 0
++DWIDTH 9 0
++BBX 9 14 2 0
+ BITMAP
+-00
+-00
+-00
+-00
+-38
+-6C
+-18
+-0C
+-6C
+-38
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
++6300
++0000
++FF80
++C000
++C000
++C000
++C000
++FF00
++C000
++C000
++C000
++C000
++C000
++FF80
+ ENDCHAR
+ STARTCHAR acute
+ ENCODING 180
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3hbo.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3hbo.bdf
new file mode 100644
index 000000000000..cc186076a51b
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3hbo.bdf
@@ -0,0 +1,102 @@
+
+$FreeBSD$
+
+--- crox3hbo.bdf	2002/08/26 18:16:12	1.1
++++ crox3hbo.bdf	2002/08/26 20:49:26
+@@ -3571,32 +3571,23 @@
+ 0000
+ 0000
+ ENDCHAR
+-STARTCHAR sterling
++STARTCHAR cyr-ie
+ ENCODING 163
+-SWIDTH 500 0
+-DWIDTH 10 0
+-BBX 16 20 -1 -4
++SWIDTH 187 0
++DWIDTH 3 0
++BBX 9 11 3 0
+ BITMAP
++1980
+ 0000
+-0000
+-0000
+-0000
+-0078
+-0198
+-0198
+-0180
+-0180
+-07F0
+-0180
+-0300
+-0300
+-0600
+-0C00
+-1FE0
+-0000
+-0000
+-0000
+-0000
++0F00
++3300
++6180
++6180
++FF00
++C000
++C300
++CC00
++7800
+ ENDCHAR
+ STARTCHAR currency
+ ENCODING 164
+@@ -4003,32 +3994,26 @@
+ 0000
+ 0000
+ ENDCHAR
+-STARTCHAR threesuperior
++STARTCHAR cyr-Ie
+ ENCODING 179
+-SWIDTH 300 0
+-DWIDTH 6 0
+-BBX 12 20 -1 -4
++SWIDTH 437 0
++DWIDTH 7 0
++BBX 13 14 3 0
+ BITMAP
++0630
+ 0000
+-0000
+-0000
+-0000
+-00E0
+-0360
+-00C0
+-0060
+-06C0
+-0380
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
++0FF8
++1800
++1800
++1800
++3000
++3FC0
++3000
++6000
++6000
++6000
++C000
++FF80
+ ENDCHAR
+ STARTCHAR acute
+ ENCODING 180
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3ho.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3ho.bdf
new file mode 100644
index 000000000000..677821e852a6
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3ho.bdf
@@ -0,0 +1,102 @@
+
+$FreeBSD$
+
+--- crox3ho.bdf	2002/08/26 18:16:12	1.1
++++ crox3ho.bdf	2002/08/26 20:49:27
+@@ -3571,32 +3571,23 @@
+ 0000
+ 0000
+ ENDCHAR
+-STARTCHAR sterling
++STARTCHAR cyr-ie
+ ENCODING 163
+-SWIDTH 450 0
+-DWIDTH 9 0
+-BBX 15 20 -1 -4
++SWIDTH 750 0
++DWIDTH 12 0
++BBX 9 11 3 0
+ BITMAP
++1980
+ 0000
+-0000
+-0000
+-0000
+-0070
+-0110
+-0110
+-0100
+-0100
+-07E0
+-0100
+-0200
+-0200
+-0400
+-0800
+-1FC0
+-0000
+-0000
+-0000
+-0000
++0E00
++2200
++4100
++4100
++FE00
++8000
++8200
++8800
++7000
+ ENDCHAR
+ STARTCHAR currency
+ ENCODING 164
+@@ -4003,32 +3994,26 @@
+ 0000
+ 0000
+ ENDCHAR
+-STARTCHAR threesuperior
++STARTCHAR cyr-Ie
+ ENCODING 179
+-SWIDTH 250 0
+-DWIDTH 5 0
+-BBX 11 20 -1 -4
++SWIDTH 375 0
++DWIDTH 6 0
++BBX 12 14 3 0
+ BITMAP
++0660
+ 0000
+-0000
+-0000
+-0000
+-00C0
+-0240
+-0080
+-0040
+-0480
+-0300
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
++0FF0
++1000
++1000
++1000
++2000
++3F80
++2000
++4000
++4000
++4000
++8000
++FF00
+ ENDCHAR
+ STARTCHAR acute
+ ENCODING 180
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3t.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3t.bdf
new file mode 100644
index 000000000000..1e5ef8c24ca7
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3t.bdf
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- crox3t.bdf	2002/08/25 11:02:05	1.1
++++ crox3t.bdf	2002/08/25 11:10:51
+@@ -3389,7 +3389,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 526 0
+ DWIDTH 10 0
+ BBX 10 19 0 -4
+@@ -3441,7 +3441,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 421 0
+ DWIDTH 8 0
+ BBX 8 19 0 -4
+@@ -3857,7 +3857,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 210 0
+ DWIDTH 4 0
+ BBX 4 19 0 -4
+@@ -4169,7 +4169,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 368 0
+ DWIDTH 7 0
+ BBX 7 19 0 -4
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3tb.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3tb.bdf
new file mode 100644
index 000000000000..eb4e69d93ca0
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3tb.bdf
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- crox3tb.bdf	2002/08/25 11:02:05	1.1
++++ crox3tb.bdf	2002/08/25 11:10:51
+@@ -3389,7 +3389,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 578 0
+ DWIDTH 11 0
+ BBX 11 19 0 -4
+@@ -3441,7 +3441,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 473 0
+ DWIDTH 9 0
+ BBX 9 19 0 -4
+@@ -3857,7 +3857,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 263 0
+ DWIDTH 5 0
+ BBX 5 19 0 -4
+@@ -4169,7 +4169,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 421 0
+ DWIDTH 8 0
+ BBX 8 19 0 -4
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3tbo.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3tbo.bdf
new file mode 100644
index 000000000000..3d40bc145738
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3tbo.bdf
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- crox3tbo.bdf	2002/08/25 11:02:05	1.1
++++ crox3tbo.bdf	2002/08/25 11:10:51
+@@ -3389,7 +3389,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 578 0
+ DWIDTH 11 0
+ BBX 17 19 -1 -4
+@@ -3441,7 +3441,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 473 0
+ DWIDTH 9 0
+ BBX 15 19 -1 -4
+@@ -3857,7 +3857,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 263 0
+ DWIDTH 5 0
+ BBX 11 19 -1 -4
+@@ -4169,7 +4169,7 @@
+ 000000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 421 0
+ DWIDTH 8 0
+ BBX 14 19 -1 -4
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3to.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3to.bdf
new file mode 100644
index 000000000000..ff0dcdefdd17
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox3to.bdf
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- crox3to.bdf	2002/08/25 11:02:05	1.1
++++ crox3to.bdf	2002/08/25 11:10:51
+@@ -3389,7 +3389,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 526 0
+ DWIDTH 10 0
+ BBX 16 19 -1 -4
+@@ -3441,7 +3441,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 421 0
+ DWIDTH 8 0
+ BBX 14 19 -1 -4
+@@ -3857,7 +3857,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 210 0
+ DWIDTH 4 0
+ BBX 10 19 -1 -4
+@@ -4169,7 +4169,7 @@
+ 000000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 368 0
+ DWIDTH 7 0
+ BBX 13 19 -1 -4
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox4h.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox4h.bdf
new file mode 100644
index 000000000000..b6112df51d16
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox4h.bdf
@@ -0,0 +1,115 @@
+
+$FreeBSD$
+
+--- crox4h.bdf	2002/08/26 18:16:12	1.1
++++ crox4h.bdf	2002/08/26 20:49:27
+@@ -4095,36 +4095,24 @@
+ 0000
+ 0000
+ ENDCHAR
+-STARTCHAR sterling
++STARTCHAR cyr-ie
+ ENCODING 163
+-SWIDTH 416 0
+-DWIDTH 10 0
+-BBX 10 24 0 -5
++SWIDTH 482 0
++DWIDTH 9 0
++BBX 9 12 1 0
+ BITMAP
++6300
+ 0000
+-0000
+-0000
+-0000
+-0000
+-0f00
+-1f80
+-30c0
+-3000
+-3000
+-3000
+-7e00
+-3000
+-1800
+-1800
+-1800
+-30c0
+-7fc0
+-7780
+-0000
+-0000
+-0000
+-0000
+-0000
++1C00
++7F00
++6300
++C180
++FF80
++FF80
++C000
++6180
++7F00
++1C00
+ ENDCHAR
+ STARTCHAR currency
+ ENCODING 164
+@@ -4591,36 +4579,29 @@
+ 00
+ 00
+ ENDCHAR
+-STARTCHAR threesuperior
++STARTCHAR cyr-Ie
+ ENCODING 179
+-SWIDTH 208 0
+-DWIDTH 5 0
+-BBX 5 24 0 -5
++SWIDTH 589 0
++DWIDTH 11 0
++BBX 11 17 1 0
+ BITMAP
+-00
+-00
+-00
+-00
+-00
+-70
+-d8
+-18
+-70
+-18
+-d8
+-70
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
++3180
++3180
++0000
++FFE0
++FFE0
++C000
++C000
++C000
++C000
++FFC0
++FFC0
++C000
++C000
++C000
++C000
++FFE0
++FFE0
+ ENDCHAR
+ STARTCHAR acute
+ ENCODING 180
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox4hb.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox4hb.bdf
new file mode 100644
index 000000000000..c6727c8e6e31
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox4hb.bdf
@@ -0,0 +1,116 @@
+
+$FreeBSD$
+
+--- crox4hb.bdf	2002/08/26 18:16:12	1.1
++++ crox4hb.bdf	2002/08/26 20:49:28
+@@ -4095,36 +4095,25 @@
+ 0000
+ 0000
+ ENDCHAR
+-STARTCHAR sterling
++STARTCHAR cyr-ie
+ ENCODING 163
+-SWIDTH 458 0
+-DWIDTH 11 0
+-BBX 11 24 0 -5
++SWIDTH 535 0
++DWIDTH 10 0
++BBX 10 13 1 0
+ BITMAP
++6180
++6180
+ 0000
+-0000
+-0000
+-0000
+-0000
+-0F80
+-1FC0
+-38E0
+-3800
+-3800
+-3800
+-7F00
+-3800
+-1C00
+-1C00
+-1C00
+-38E0
+-7FE0
+-7FC0
+-0000
+-0000
+-0000
+-0000
+-0000
++1E00
++7F80
++7380
++E1C0
++FFC0
++FFC0
++E000
++71C0
++7F80
++1E00
+ ENDCHAR
+ STARTCHAR currency
+ ENCODING 164
+@@ -4591,36 +4580,29 @@
+ 00
+ 00
+ ENDCHAR
+-STARTCHAR threesuperior
++STARTCHAR cyr-Ie
+ ENCODING 179
+-SWIDTH 250 0
+-DWIDTH 6 0
+-BBX 6 24 0 -5
++SWIDTH 642 0
++DWIDTH 12 0
++BBX 12 17 1 0
+ BITMAP
+-00
+-00
+-00
+-00
+-00
+-78
+-FC
+-1C
+-78
+-1C
+-FC
+-78
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
++30C0
++30C0
++0000
++FFF0
++FFF0
++E000
++E000
++E000
++E000
++FFE0
++FFE0
++E000
++E000
++E000
++E000
++FFF0
++FFF0
+ ENDCHAR
+ STARTCHAR acute
+ ENCODING 180
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox4hbo.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox4hbo.bdf
new file mode 100644
index 000000000000..a829df12c32c
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox4hbo.bdf
@@ -0,0 +1,117 @@
+
+$FreeBSD$
+
+--- crox4hbo.bdf	2002/08/26 18:16:12	1.1
++++ crox4hbo.bdf	2002/08/26 20:49:29
+@@ -4095,36 +4095,25 @@
+ 000000
+ 000000
+ ENDCHAR
+-STARTCHAR sterling
++STARTCHAR cyr-ie
+ ENCODING 163
+-SWIDTH 458 0
+-DWIDTH 11 0
+-BBX 19 24 -1 -5
++SWIDTH 803 0
++DWIDTH 15 0
++BBX 12 13 3 0
+ BITMAP
+-000000
+-000000
+-000000
+-000000
+-000000
+-001F00
+-007F00
+-00E380
+-00E000
+-01C000
+-01C000
+-03F800
+-038000
+-01C000
+-01C000
+-038000
+-071C00
+-0FFC00
+-1FF000
+-000000
+-000000
+-000000
+-000000
+-000000
++0630
++0C60
++0000
++0780
++1FE0
++1CE0
++70E0
++7FE0
++7FE0
++E000
++71C0
++7F80
++3C00
+ ENDCHAR
+ STARTCHAR currency
+ ENCODING 164
+@@ -4591,36 +4580,29 @@
+ 0000
+ 0000
+ ENDCHAR
+-STARTCHAR threesuperior
++STARTCHAR cyr-Ie
+ ENCODING 179
+-SWIDTH 250 0
+-DWIDTH 6 0
+-BBX 14 24 -1 -5
++SWIDTH 482 0
++DWIDTH 9 0
++BBX 17 17 2 0
+ BITMAP
+-0000
+-0000
+-0000
+-0000
+-0000
+-00F0
+-03F0
+-0070
+-01E0
+-00E0
+-07E0
+-03C0
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
++00C300
++018600
++000000
++07FF80
++0FFF00
++0E0000
++0E0000
++1C0000
++1C0000
++1FFC00
++3FF800
++380000
++380000
++700000
++700000
++7FF800
++FFF000
+ ENDCHAR
+ STARTCHAR acute
+ ENCODING 180
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox4ho.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox4ho.bdf
new file mode 100644
index 000000000000..8c67e3c31d5e
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox4ho.bdf
@@ -0,0 +1,116 @@
+
+$FreeBSD$
+
+--- crox4ho.bdf	2002/08/26 18:16:12	1.1
++++ crox4ho.bdf	2002/08/26 20:49:29
+@@ -4095,36 +4095,25 @@
+ 000000
+ 000000
+ ENDCHAR
+-STARTCHAR sterling
++STARTCHAR cyr-ie
+ ENCODING 163
+-SWIDTH 416 0
+-DWIDTH 10 0
+-BBX 18 24 -1 -5
++SWIDTH 750 0
++DWIDTH 14 0
++BBX 11 13 3 0
+ BITMAP
+-000000
+-000000
+-000000
+-000000
+-000000
+-001E00
+-007E00
+-00C300
+-00C000
+-018000
+-018000
+-03F000
+-030000
+-018000
+-018000
+-030000
+-061800
+-0FF800
+-1DE000
+-000000
+-000000
+-000000
+-000000
+-000000
++0660
++0CC0
++0000
++0700
++1FC0
++18C0
++60C0
++7FC0
++7FC0
++C000
++6180
++7F00
++3800
+ ENDCHAR
+ STARTCHAR currency
+ ENCODING 164
+@@ -4591,36 +4580,29 @@
+ 0000
+ 0000
+ ENDCHAR
+-STARTCHAR threesuperior
++STARTCHAR cyr-Ie
+ ENCODING 179
+-SWIDTH 208 0
+-DWIDTH 5 0
+-BBX 13 24 -1 -5
++SWIDTH 428 0
++DWIDTH 8 0
++BBX 16 17 2 0
+ BITMAP
++00C3
++0186
+ 0000
+-0000
+-0000
+-0000
+-0000
+-00E0
+-0360
+-0060
+-01C0
+-00C0
+-06C0
+-0380
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
++07FF
++0FFE
++0C00
++0C00
++1800
++1800
++1FF8
++3FF0
++3000
++3000
++6000
++6000
++7FF0
++FFE0
+ ENDCHAR
+ STARTCHAR acute
+ ENCODING 180
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox4t.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox4t.bdf
new file mode 100644
index 000000000000..085390f022db
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox4t.bdf
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- crox4t.bdf	2002/08/25 11:02:05	1.1
++++ crox4t.bdf	2002/08/25 11:10:52
+@@ -3647,7 +3647,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 571 0
+ DWIDTH 12 0
+ BBX 12 21 0 -5
+@@ -3703,7 +3703,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 428 0
+ DWIDTH 9 0
+ BBX 9 21 0 -5
+@@ -4151,7 +4151,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 238 0
+ DWIDTH 5 0
+ BBX 5 21 0 -5
+@@ -4487,7 +4487,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 428 0
+ DWIDTH 9 0
+ BBX 9 21 0 -5
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox4tb.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox4tb.bdf
new file mode 100644
index 000000000000..f3b93587d79c
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox4tb.bdf
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- crox4tb.bdf	2002/08/25 11:02:05	1.1
++++ crox4tb.bdf	2002/08/25 11:10:52
+@@ -3647,7 +3647,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 619 0
+ DWIDTH 13 0
+ BBX 13 21 0 -5
+@@ -3703,7 +3703,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 476 0
+ DWIDTH 10 0
+ BBX 10 21 0 -5
+@@ -4151,7 +4151,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 285 0
+ DWIDTH 6 0
+ BBX 6 21 0 -5
+@@ -4487,7 +4487,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 476 0
+ DWIDTH 10 0
+ BBX 10 21 0 -5
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox4tbo.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox4tbo.bdf
new file mode 100644
index 000000000000..fafa6b5bfc0b
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox4tbo.bdf
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- crox4tbo.bdf	2002/08/25 11:02:05	1.1
++++ crox4tbo.bdf	2002/08/25 11:10:52
+@@ -3647,7 +3647,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 619 0
+ DWIDTH 13 0
+ BBX 20 21 -1 -5
+@@ -3703,7 +3703,7 @@
+ 000000
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 476 0
+ DWIDTH 10 0
+ BBX 17 21 -1 -5
+@@ -4151,7 +4151,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 285 0
+ DWIDTH 6 0
+ BBX 13 21 -1 -5
+@@ -4487,7 +4487,7 @@
+ 000000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 476 0
+ DWIDTH 10 0
+ BBX 17 21 -1 -5
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox4to.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox4to.bdf
new file mode 100644
index 000000000000..0e38da8fa9c7
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox4to.bdf
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- crox4to.bdf	2002/08/25 11:02:05	1.1
++++ crox4to.bdf	2002/08/25 11:10:52
+@@ -3647,7 +3647,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 571 0
+ DWIDTH 12 0
+ BBX 19 21 -1 -5
+@@ -3703,7 +3703,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 428 0
+ DWIDTH 9 0
+ BBX 16 21 -1 -5
+@@ -4151,7 +4151,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 238 0
+ DWIDTH 5 0
+ BBX 12 21 -1 -5
+@@ -4487,7 +4487,7 @@
+ 000000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 428 0
+ DWIDTH 9 0
+ BBX 16 21 -1 -5
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox5h.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox5h.bdf
new file mode 100644
index 000000000000..07fd24af3a35
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox5h.bdf
@@ -0,0 +1,132 @@
+
+$FreeBSD$
+
+--- crox5h.bdf	2002/08/26 18:16:12	1.1
++++ crox5h.bdf	2002/08/26 20:49:30
+@@ -4750,41 +4750,28 @@
+ 0000
+ 0000
+ ENDCHAR
+-STARTCHAR sterling
++STARTCHAR cyr-ie
+ ENCODING 163
+-SWIDTH 448 0
+-DWIDTH 13 0
+-BBX 13 29 0 -6
++SWIDTH 500 0
++DWIDTH 12 0
++BBX 12 16 1 0
+ BITMAP
++30C0
++30C0
+ 0000
+ 0000
+-0000
+-0000
+-0000
+-0000
+-07c0
+-0fe0
+-1c70
+-1830
+-1800
+-1800
+-1800
+-7f00
+-7f00
+-0c00
+-0c00
+-0c00
+-0c00
+-1800
+-3f30
+-7ff0
+-33e0
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
++0F00
++3FC0
++70E0
++6060
++C030
++FFF0
++FFF0
++C000
++6000
++7070
++3FE0
++0F80
+ ENDCHAR
+ STARTCHAR currency
+ ENCODING 164
+@@ -5326,41 +5313,33 @@
+ 00
+ 00
+ ENDCHAR
+-STARTCHAR threesuperior
++STARTCHAR cyr-Ie
+ ENCODING 179
+-SWIDTH 241 0
+-DWIDTH 7 0
+-BBX 7 29 0 -6
++SWIDTH 541 0
++DWIDTH 13 0
++BBX 13 21 2 0
+ BITMAP
+-00
+-00
+-00
+-00
+-00
+-00
+-3c
+-66
+-06
+-1c
+-06
+-06
+-66
+-3c
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
++3060
++3060
++0000
++0000
++FFF8
++FFF8
++C000
++C000
++C000
++C000
++C000
++FFE0
++FFE0
++C000
++C000
++C000
++C000
++C000
++C000
++FFF8
++FFF8
+ ENDCHAR
+ STARTCHAR acute
+ ENCODING 180
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox5hb.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox5hb.bdf
new file mode 100644
index 000000000000..ee57b34c0950
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox5hb.bdf
@@ -0,0 +1,134 @@
+
+$FreeBSD$
+
+--- crox5hb.bdf	2002/08/26 18:16:12	1.1
++++ crox5hb.bdf	2002/08/26 20:49:31
+@@ -4750,41 +4750,29 @@
+ 0000
+ 0000
+ ENDCHAR
+-STARTCHAR sterling
++STARTCHAR cyr-ie
+ ENCODING 163
+-SWIDTH 482 0
+-DWIDTH 14 0
+-BBX 14 29 0 -6
++SWIDTH 541 0
++DWIDTH 13 0
++BBX 13 17 1 0
+ BITMAP
++38E0
++38E0
++38E0
+ 0000
+ 0000
+-0000
+-0000
+-0000
+-0000
+-07E0
+-0FF0
+-1E78
+-1C38
+-1C00
+-1C00
+-1C00
+-7F80
+-7F80
+-0E00
+-0E00
+-0E00
+-0E00
+-1C00
+-3FB8
+-7FF8
+-3BF0
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
++0F80
++3FE0
++78F0
++7070
++E038
++FFF8
++FFF8
++E000
++7000
++7878
++3FF0
++0FC0
+ ENDCHAR
+ STARTCHAR currency
+ ENCODING 164
+@@ -5326,41 +5314,34 @@
+ 00
+ 00
+ ENDCHAR
+-STARTCHAR threesuperior
++STARTCHAR cyr-Ie
+ ENCODING 179
+-SWIDTH 275 0
+-DWIDTH 8 0
+-BBX 8 29 0 -6
++SWIDTH 583 0
++DWIDTH 14 0
++BBX 14 22 2 0
+ BITMAP
+-00
+-00
+-00
+-00
+-00
+-00
+-3E
+-77
+-07
+-1E
+-07
+-07
+-77
+-3E
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
++3870
++3870
++3870
++0000
++0000
++FFFC
++FFFC
++E000
++E000
++E000
++E000
++E000
++FFF0
++FFF0
++E000
++E000
++E000
++E000
++E000
++E000
++FFFC
++FFFC
+ ENDCHAR
+ STARTCHAR acute
+ ENCODING 180
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox5hbo.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox5hbo.bdf
new file mode 100644
index 000000000000..52093af1a3b5
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox5hbo.bdf
@@ -0,0 +1,133 @@
+
+$FreeBSD$
+
+--- crox5hbo.bdf	2002/08/26 18:16:12	1.1
++++ crox5hbo.bdf	2002/08/26 20:49:32
+@@ -4750,41 +4750,29 @@
+ 000000
+ 000000
+ ENDCHAR
+-STARTCHAR sterling
++STARTCHAR cyr-ie
+ ENCODING 163
+-SWIDTH 482 0
+-DWIDTH 14 0
+-BBX 23 29 -1 -6
++SWIDTH 791 0
++DWIDTH 19 0
++BBX 15 17 4 0
+ BITMAP
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-0007E0
+-000FF0
+-003CF0
+-003870
+-003800
+-007000
+-007000
+-01FE00
+-03FC00
+-007000
+-007000
+-00E000
+-00E000
+-01C000
+-07F700
+-0FFF00
+-077E00
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
++0186
++038E
++030C
++0000
++0000
++03E0
++0FF8
++1E3C
++3838
++701C
++7FFC
++FFF8
++E000
++7000
++F0F0
++7FE0
++1F80
+ ENDCHAR
+ STARTCHAR currency
+ ENCODING 164
+@@ -5326,41 +5314,32 @@
+ 000000
+ 000000
+ ENDCHAR
+-STARTCHAR threesuperior
++STARTCHAR cyr-Ie
+ ENCODING 179
+-SWIDTH 275 0
+-DWIDTH 8 0
+-BBX 17 29 -1 -6
++SWIDTH 708 0
++DWIDTH 17 0
++BBX 19 20 4 0
+ BITMAP
++0071C0
++00E380
+ 000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-003E00
+-007700
+-000E00
+-003C00
+-000E00
+-001C00
+-01DC00
+-00F800
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
++07FFE0
++07FFE0
++0E0000
++0E0000
++0E0000
++1C0000
++1C0000
++1FFE00
++3FFC00
++380000
++380000
++700000
++700000
++700000
++E00000
++FFFC00
++FFFC00
+ ENDCHAR
+ STARTCHAR acute
+ ENCODING 180
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox5ho.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox5ho.bdf
new file mode 100644
index 000000000000..6ab2816d634d
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox5ho.bdf
@@ -0,0 +1,136 @@
+
+$FreeBSD$
+
+--- crox5ho.bdf	2002/08/26 18:16:12	1.1
++++ crox5ho.bdf	2002/08/26 20:49:32
+@@ -4750,41 +4750,29 @@
+ 000000
+ 000000
+ ENDCHAR
+-STARTCHAR sterling
++STARTCHAR cyr-ie
+ ENCODING 163
+-SWIDTH 448 0
+-DWIDTH 13 0
+-BBX 22 29 -1 -6
++SWIDTH 791 0
++DWIDTH 19 0
++BBX 15 17 4 0
+ BITMAP
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-0007C0
+-000FE0
+-0038E0
+-003060
+-003000
+-006000
+-006000
+-01FC00
+-03F800
+-006000
+-006000
+-00C000
+-00C000
+-018000
+-07E600
+-0FFE00
+-067C00
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
++0186
++038E
++030C
++0000
++0000
++03C0
++0FF0
++1C38
++3030
++6018
++7FF8
++FFF0
++C000
++6000
++E0E0
++7FC0
++1F00
+ ENDCHAR
+ STARTCHAR currency
+ ENCODING 164
+@@ -5326,41 +5314,34 @@
+ 0000
+ 0000
+ ENDCHAR
+-STARTCHAR threesuperior
++STARTCHAR cyr-Ie
+ ENCODING 179
+-SWIDTH 241 0
+-DWIDTH 7 0
+-BBX 16 29 -1 -6
++SWIDTH 916 0
++DWIDTH 22 0
++BBX 18 22 4 0
+ BITMAP
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-003C
+-0066
+-000C
+-0038
+-000C
+-0018
+-0198
+-00F0
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
++0060C0
++00E1C0
++00C180
++000000
++000000
++07FFC0
++07FFC0
++0C0000
++0C0000
++0C0000
++180000
++180000
++1FFC00
++3FF800
++300000
++300000
++600000
++600000
++600000
++C00000
++FFF800
++FFF800
+ ENDCHAR
+ STARTCHAR acute
+ ENCODING 180
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox5t.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox5t.bdf
new file mode 100644
index 000000000000..8612fafb899a
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox5t.bdf
@@ -0,0 +1,50 @@
+
+$FreeBSD$
+
+--- crox5t.bdf	2002/08/25 11:02:05	1.1
++++ crox5t.bdf	2002/08/25 11:10:52
+@@ -4421,7 +4421,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 555 0
+ DWIDTH 15 0
+ BBX 15 27 0 -6
+@@ -4489,7 +4489,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 444 0
+ DWIDTH 12 0
+ BBX 12 27 0 -6
+@@ -4693,7 +4693,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR copyright
+-ENCODING 169
++ENCODING 163
+ SWIDTH 666 0
+ DWIDTH 18 0
+ BBX 18 27 0 -6
+@@ -5033,7 +5033,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 222 0
+ DWIDTH 6 0
+ BBX 6 27 0 -6
+@@ -5441,7 +5441,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 407 0
+ DWIDTH 11 0
+ BBX 11 27 0 -6
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox5tb.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox5tb.bdf
new file mode 100644
index 000000000000..b576fbfdbe79
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox5tb.bdf
@@ -0,0 +1,50 @@
+
+$FreeBSD$
+
+--- crox5tb.bdf	2002/08/25 11:02:05	1.1
++++ crox5tb.bdf	2002/08/25 11:10:52
+@@ -4421,7 +4421,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 592 0
+ DWIDTH 16 0
+ BBX 16 27 0 -6
+@@ -4489,7 +4489,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 481 0
+ DWIDTH 13 0
+ BBX 13 27 0 -6
+@@ -4693,7 +4693,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR copyright
+-ENCODING 169
++ENCODING 163
+ SWIDTH 703 0
+ DWIDTH 19 0
+ BBX 19 27 0 -6
+@@ -5033,7 +5033,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 259 0
+ DWIDTH 7 0
+ BBX 7 27 0 -6
+@@ -5441,7 +5441,7 @@
+ 000000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 444 0
+ DWIDTH 12 0
+ BBX 12 27 0 -6
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox5tbo.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox5tbo.bdf
new file mode 100644
index 000000000000..0cbf829ff640
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox5tbo.bdf
@@ -0,0 +1,50 @@
+
+$FreeBSD$
+
+--- crox5tbo.bdf	2002/08/25 11:02:05	1.1
++++ crox5tbo.bdf	2002/08/25 11:10:52
+@@ -4421,7 +4421,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 592 0
+ DWIDTH 16 0
+ BBX 25 27 -1 -6
+@@ -4489,7 +4489,7 @@
+ 000000
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 481 0
+ DWIDTH 13 0
+ BBX 22 27 -1 -6
+@@ -4693,7 +4693,7 @@
+ 000000
+ ENDCHAR
+ STARTCHAR copyright
+-ENCODING 169
++ENCODING 163
+ SWIDTH 703 0
+ DWIDTH 19 0
+ BBX 28 27 -1 -6
+@@ -5033,7 +5033,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 259 0
+ DWIDTH 7 0
+ BBX 16 27 -1 -6
+@@ -5441,7 +5441,7 @@
+ 00000000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 444 0
+ DWIDTH 12 0
+ BBX 21 27 -1 -6
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox5to.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox5to.bdf
new file mode 100644
index 000000000000..23d4dfe3a549
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox5to.bdf
@@ -0,0 +1,50 @@
+
+$FreeBSD$
+
+--- crox5to.bdf	2002/08/25 11:02:05	1.1
++++ crox5to.bdf	2002/08/25 11:10:52
+@@ -4421,7 +4421,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 555 0
+ DWIDTH 15 0
+ BBX 24 27 -1 -6
+@@ -4489,7 +4489,7 @@
+ 000000
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 444 0
+ DWIDTH 12 0
+ BBX 21 27 -1 -6
+@@ -4693,7 +4693,7 @@
+ 000000
+ ENDCHAR
+ STARTCHAR copyright
+-ENCODING 169
++ENCODING 163
+ SWIDTH 666 0
+ DWIDTH 18 0
+ BBX 27 27 -1 -6
+@@ -5033,7 +5033,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 222 0
+ DWIDTH 6 0
+ BBX 15 27 -1 -6
+@@ -5441,7 +5441,7 @@
+ 00000000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 407 0
+ DWIDTH 11 0
+ BBX 20 27 -1 -6
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox6h.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox6h.bdf
new file mode 100644
index 000000000000..2094b6db714d
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox6h.bdf
@@ -0,0 +1,164 @@
+
+$FreeBSD$
+
+--- crox6h.bdf	2002/08/26 18:16:12	1.1
++++ crox6h.bdf	2002/08/26 20:49:33
+@@ -5798,49 +5798,34 @@
+ 000000
+ 000000
+ ENDCHAR
+-STARTCHAR sterling
++STARTCHAR cyr-ie
+ ENCODING 163
+-SWIDTH 486 0
+-DWIDTH 18 0
+-BBX 18 37 0 -8
++SWIDTH 468 0
++DWIDTH 15 0
++BBX 15 22 1 0
+ BITMAP
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-01e000
+-07f800
+-0ffc00
+-1e1e00
+-1c0e00
+-380700
+-380700
+-380000
+-380000
+-1c0000
+-1c0000
+-7fe000
+-7fe000
+-060000
+-060000
+-060000
+-060000
+-060000
+-0e0000
+-0dc180
+-1fff80
+-3fff80
+-183f00
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
++1830
++3C78
++3C78
++1830
++0000
++0000
++0FE0
++3FF8
++7C7C
++701C
++F01E
++E00E
++FFFE
++FFFE
++E000
++E000
++E000
++F01E
++701C
++7C7C
++3FF8
++0FE0
+ ENDCHAR
+ STARTCHAR currency
+ ENCODING 164
+@@ -6502,49 +6487,41 @@
+ 0000
+ 0000
+ ENDCHAR
+-STARTCHAR threesuperior
++STARTCHAR cyr-Ie
+ ENCODING 179
+-SWIDTH 243 0
+-DWIDTH 9 0
+-BBX 9 37 0 -8
++SWIDTH 531 0
++DWIDTH 17 0
++BBX 17 29 3 0
+ BITMAP
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-1e00
+-3f00
+-6180
+-0180
+-0f00
+-0f00
+-0180
+-0180
+-6180
+-3f00
+-1e00
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
++180C00
++3C1E00
++3C1E00
++180C00
++000000
++000000
++FFFF80
++FFFF80
++FFFF80
++E00000
++E00000
++E00000
++E00000
++E00000
++E00000
++FFFE00
++FFFE00
++FFFE00
++E00000
++E00000
++E00000
++E00000
++E00000
++E00000
++E00000
++E00000
++FFFF80
++FFFF80
++FFFF80
+ ENDCHAR
+ STARTCHAR acute
+ ENCODING 180
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox6hb.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox6hb.bdf
new file mode 100644
index 000000000000..61a6f971437a
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox6hb.bdf
@@ -0,0 +1,164 @@
+
+$FreeBSD$
+
+--- crox6hb.bdf	2002/08/26 18:16:12	1.1
++++ crox6hb.bdf	2002/08/26 20:49:35
+@@ -5798,49 +5798,34 @@
+ 000000
+ 000000
+ ENDCHAR
+-STARTCHAR sterling
++STARTCHAR cyr-ie
+ ENCODING 163
+-SWIDTH 513 0
+-DWIDTH 19 0
+-BBX 19 37 0 -8
++SWIDTH 500 0
++DWIDTH 16 0
++BBX 16 22 1 0
+ BITMAP
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-01F000
+-07FC00
+-0FFE00
+-1F1F00
+-1E0F00
+-3C0780
+-3C0780
+-3C0000
+-3C0000
+-1E0000
+-1E0000
+-7FF000
+-7FF000
+-070000
+-070000
+-070000
+-070000
+-070000
+-0F0000
+-0FE1C0
+-1FFFC0
+-3FFFC0
+-1C3F80
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
++1818
++3C3C
++3C3C
++1818
++0000
++0000
++0FF0
++3FFC
++7E7E
++781E
++F81F
++F00F
++FFFF
++FFFF
++F000
++F000
++F000
++F81F
++781E
++7E7E
++3FFC
++0FF0
+ ENDCHAR
+ STARTCHAR currency
+ ENCODING 164
+@@ -6502,49 +6487,41 @@
+ 0000
+ 0000
+ ENDCHAR
+-STARTCHAR threesuperior
++STARTCHAR cyr-Ie
+ ENCODING 179
+-SWIDTH 270 0
+-DWIDTH 10 0
+-BBX 10 37 0 -8
++SWIDTH 562 0
++DWIDTH 18 0
++BBX 18 29 3 0
+ BITMAP
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-1F00
+-3F80
+-71C0
+-01C0
+-0F80
+-0F80
+-01C0
+-01C0
+-71C0
+-3F80
+-1F00
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
+-0000
++0C0C00
++1E1E00
++1E1E00
++0C0C00
++000000
++000000
++FFFFC0
++FFFFC0
++FFFFC0
++F00000
++F00000
++F00000
++F00000
++F00000
++F00000
++FFFF00
++FFFF00
++FFFF00
++F00000
++F00000
++F00000
++F00000
++F00000
++F00000
++F00000
++F00000
++FFFFC0
++FFFFC0
++FFFFC0
+ ENDCHAR
+ STARTCHAR acute
+ ENCODING 180
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox6hbo.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox6hbo.bdf
new file mode 100644
index 000000000000..8fceafc38450
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox6hbo.bdf
@@ -0,0 +1,164 @@
+
+$FreeBSD$
+
+--- crox6hbo.bdf	2002/08/26 18:16:12	1.1
++++ crox6hbo.bdf	2002/08/26 20:49:36
+@@ -5798,49 +5798,34 @@
+ 00000000
+ 00000000
+ ENDCHAR
+-STARTCHAR sterling
++STARTCHAR cyr-ie
+ ENCODING 163
+-SWIDTH 513 0
+-DWIDTH 19 0
+-BBX 31 37 -1 -8
++SWIDTH 750 0
++DWIDTH 24 0
++BBX 19 22 5 0
+ BITMAP
+-00000000
+-00000000
+-00000000
+-00000000
+-00000000
+-00000000
+-00003E00
+-0001FF00
+-0003FF80
+-0007C7C0
+-000F0780
+-001E03C0
+-001E03C0
+-003C0000
+-003C0000
+-001E0000
+-003C0000
+-00FFE000
+-00FFE000
+-001C0000
+-001C0000
+-001C0000
+-00380000
+-00380000
+-00780000
+-00FE1C00
+-01FFFC00
+-03FFFC00
+-0387F000
+-00000000
+-00000000
+-00000000
+-00000000
+-00000000
+-00000000
+-00000000
+-00000000
++0070E0
++00F1E0
++01E3C0
++01C380
++000000
++000000
++01FE00
++07FF80
++0FCFC0
++1E0780
++3E07C0
++3C03C0
++7FFF80
++7FFF80
++780000
++F00000
++F00000
++F81F00
++F03C00
++FCFC00
++7FF800
++3FC000
+ ENDCHAR
+ STARTCHAR currency
+ ENCODING 164
+@@ -6502,49 +6487,41 @@
+ 000000
+ 000000
+ ENDCHAR
+-STARTCHAR threesuperior
++STARTCHAR cyr-Ie
+ ENCODING 179
+-SWIDTH 270 0
+-DWIDTH 10 0
+-BBX 22 37 -1 -8
++SWIDTH 968 0
++DWIDTH 31 0
++BBX 26 29 5 0
+ BITMAP
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-0003E0
+-000FE0
+-001C70
+-000070
+-0007C0
+-0007C0
+-0000E0
+-0001C0
+-0071C0
+-003F80
+-003E00
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
++0001C1C0
++0003C3C0
++00078780
++00070700
++00000000
++00000000
++00FFFFC0
++01FFFF80
++01FFFF80
++01E00000
++03C00000
++03C00000
++03C00000
++07800000
++07800000
++07FFF800
++0FFFF000
++0FFFF000
++0F000000
++1E000000
++1E000000
++1E000000
++3C000000
++3C000000
++3C000000
++78000000
++7FFFE000
++7FFFE000
++FFFFC000
+ ENDCHAR
+ STARTCHAR acute
+ ENCODING 180
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox6ho.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox6ho.bdf
new file mode 100644
index 000000000000..4ee7b6d6dda8
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox6ho.bdf
@@ -0,0 +1,164 @@
+
+$FreeBSD$
+
+--- crox6ho.bdf	2002/08/26 18:16:12	1.1
++++ crox6ho.bdf	2002/08/26 20:49:37
+@@ -5798,49 +5798,34 @@
+ 00000000
+ 00000000
+ ENDCHAR
+-STARTCHAR sterling
++STARTCHAR cyr-ie
+ ENCODING 163
+-SWIDTH 486 0
+-DWIDTH 18 0
+-BBX 30 37 -1 -8
++SWIDTH 781 0
++DWIDTH 25 0
++BBX 20 22 5 0
+ BITMAP
+-00000000
+-00000000
+-00000000
+-00000000
+-00000000
+-00000000
+-00003C00
+-0001FE00
+-0003FF00
+-00078780
+-000E0700
+-001C0380
+-001C0380
+-00380000
+-00380000
+-001C0000
+-00380000
+-00FFC000
+-00FFC000
+-00180000
+-00180000
+-00180000
+-00300000
+-00300000
+-00700000
+-00DC1800
+-01FFF800
+-03FFF800
+-0307E000
+-00000000
+-00000000
+-00000000
+-00000000
+-00000000
+-00000000
+-00000000
+-00000000
++007070
++00F0F0
++01E1E0
++01C1C0
++000000
++000000
++01FC00
++07FF00
++0F8F80
++1C0700
++3C0780
++380380
++7FFF00
++7FFF00
++700000
++E00000
++E00000
++F01E00
++E03800
++F8F800
++7FF000
++3F8000
+ ENDCHAR
+ STARTCHAR currency
+ ENCODING 164
+@@ -6502,49 +6487,41 @@
+ 000000
+ 000000
+ ENDCHAR
+-STARTCHAR threesuperior
++STARTCHAR cyr-Ie
+ ENCODING 179
+-SWIDTH 243 0
+-DWIDTH 9 0
+-BBX 21 37 -1 -8
++SWIDTH 937 0
++DWIDTH 30 0
++BBX 25 29 5 0
+ BITMAP
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-0003C0
+-000FC0
+-001860
+-000060
+-000780
+-000780
+-0000C0
+-000180
+-006180
+-003F00
+-003C00
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
+-000000
++00038380
++00078780
++000F0F00
++000E0E00
++00000000
++00000000
++00FFFF80
++01FFFF00
++01FFFF00
++01C00000
++03800000
++03800000
++03800000
++07000000
++07000000
++07FFF000
++0FFFE000
++0FFFE000
++0E000000
++1C000000
++1C000000
++1C000000
++38000000
++38000000
++38000000
++70000000
++7FFFC000
++7FFFC000
++FFFF8000
+ ENDCHAR
+ STARTCHAR acute
+ ENCODING 180
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox6t.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox6t.bdf
new file mode 100644
index 000000000000..0aad5aaad62a
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox6t.bdf
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- crox6t.bdf	2002/08/25 11:02:05	1.1
++++ crox6t.bdf	2002/08/25 11:10:52
+@@ -5453,7 +5453,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 571 0
+ DWIDTH 20 0
+ BBX 20 35 0 -8
+@@ -5537,7 +5537,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 457 0
+ DWIDTH 16 0
+ BBX 16 35 0 -8
+@@ -6209,7 +6209,7 @@
+ 00
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 228 0
+ DWIDTH 8 0
+ BBX 8 35 0 -8
+@@ -6713,7 +6713,7 @@
+ 000000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 400 0
+ DWIDTH 14 0
+ BBX 14 35 0 -8
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox6tb.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox6tb.bdf
new file mode 100644
index 000000000000..27424212e9a5
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox6tb.bdf
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- crox6tb.bdf	2002/08/25 11:02:05	1.1
++++ crox6tb.bdf	2002/08/25 11:10:52
+@@ -5453,7 +5453,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 600 0
+ DWIDTH 21 0
+ BBX 21 35 0 -8
+@@ -5537,7 +5537,7 @@
+ 000000
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 485 0
+ DWIDTH 17 0
+ BBX 17 35 0 -8
+@@ -6209,7 +6209,7 @@
+ 0000
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 257 0
+ DWIDTH 9 0
+ BBX 9 35 0 -8
+@@ -6713,7 +6713,7 @@
+ 000000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 428 0
+ DWIDTH 15 0
+ BBX 15 35 0 -8
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox6tbo.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox6tbo.bdf
new file mode 100644
index 000000000000..40ade594c0ac
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox6tbo.bdf
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- crox6tbo.bdf	2002/08/25 11:02:05	1.1
++++ crox6tbo.bdf	2002/08/25 11:10:52
+@@ -5453,7 +5453,7 @@
+ 000000
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 600 0
+ DWIDTH 21 0
+ BBX 32 35 -1 -8
+@@ -5537,7 +5537,7 @@
+ 00000000
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 485 0
+ DWIDTH 17 0
+ BBX 28 35 -1 -8
+@@ -6209,7 +6209,7 @@
+ 000000
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 257 0
+ DWIDTH 9 0
+ BBX 20 35 -1 -8
+@@ -6713,7 +6713,7 @@
+ 0000000000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 428 0
+ DWIDTH 15 0
+ BBX 26 35 -1 -8
diff --git a/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox6to.bdf b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox6to.bdf
new file mode 100644
index 000000000000..99be04122374
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontCyrillic/files/patch-crox6to.bdf
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- crox6to.bdf	2002/08/25 11:02:05	1.1
++++ crox6to.bdf	2002/08/25 11:10:52
+@@ -5453,7 +5453,7 @@
+ 000000
+ ENDCHAR
+ STARTCHAR exclamdown
+-ENCODING 161
++ENCODING 179
+ SWIDTH 571 0
+ DWIDTH 20 0
+ BBX 31 35 -1 -8
+@@ -5537,7 +5537,7 @@
+ 00000000
+ ENDCHAR
+ STARTCHAR sterling
+-ENCODING 163
++ENCODING 169
+ SWIDTH 457 0
+ DWIDTH 16 0
+ BBX 27 35 -1 -8
+@@ -6209,7 +6209,7 @@
+ 000000
+ ENDCHAR
+ STARTCHAR threesuperior
+-ENCODING 179
++ENCODING 161
+ SWIDTH 228 0
+ DWIDTH 8 0
+ BBX 19 35 -1 -8
+@@ -6713,7 +6713,7 @@
+ 0000000000
+ ENDCHAR
+ STARTCHAR questiondown
+-ENCODING 169
++ENCODING 163
+ SWIDTH 400 0
+ DWIDTH 14 0
+ BBX 25 35 -1 -8