kio8-* encoding improvement

Submitted by: mi@aldan.algebra.com
Approved by:  will

38 files changed, 1370 insertions, 6 deletions

diff --git a/x11-toolkits/qt22/Makefile b/x11-toolkits/qt22/Makefile
index e7fc891de579..6c597d5eccc4 100644
--- a/x11-toolkits/qt22/Makefile
+++ b/x11-toolkits/qt22/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	qt
 PORTVERSION=	2.2.3
 .if exists(${X11BASE}/lib/libXft.so) && !defined(NO_AA)
-PORTREVISION=	1
+PORTREVISION=	2
 .endif
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
diff --git a/x11-toolkits/qt22/files/patch-ak b/x11-toolkits/qt22/files/patch-ak
new file mode 100644
index 000000000000..7d9087256be1
--- /dev/null
+++ b/x11-toolkits/qt22/files/patch-ak
@@ -0,0 +1,23 @@
+diff -ur include/qfont.h include/qfont.h
+--- include/qfont.h	Wed Oct  4 13:48:48 2000
++++ include/qfont.h	Mon Oct  9 11:53:48 2000
+@@ -70,6 +70,9 @@
+ 		     ISO_8859_14, Latin8 = ISO_8859_14,
+ 		     ISO_8859_15, Latin9 = ISO_8859_15,
+ 		     KOI8R,
++		     KOI8U,
++		     CP_1251,
++		     PT_154,
+ 		     Set_Ja, Set_1 = Set_Ja,
+ 		     Set_Ko,
+ 		     Set_Th_TH,
+@@ -96,8 +99,7 @@
+ 		     KSC_5601,
+ 		     GB_2312,
+ 		     Big5,
+-		     TSCII,
+-		     KOI8U
++		     TSCII
+     };
+     enum StyleHint { Helvetica, Times, Courier, OldEnglish,  System, AnyStyle,
+ 		     SansSerif	= Helvetica,
diff --git a/x11-toolkits/qt22/files/patch-al b/x11-toolkits/qt22/files/patch-al
new file mode 100644
index 000000000000..a7a86c62bc89
--- /dev/null
+++ b/x11-toolkits/qt22/files/patch-al
@@ -0,0 +1,31 @@
+diff -ur src/kernel/qfont.cpp src/kernel/qfont.cpp
+--- src/kernel/qfont.cpp	Wed Oct  4 13:48:48 2000
++++ src/kernel/qfont.cpp	Mon Oct  9 11:53:48 2000
+@@ -200,6 +200,8 @@
+    <li> \c QFont::KOI8U - KOI8-U, Cyrillic/Ukrainian, defined in
+        <a href="ftp://ftp.nordu.net/rfc/rfc2319.txt">RFC 2319.</a>
+    <li> \c QFont::AnyCharSet - whatever is handiest.
++  <li> \c QFont::CP_1251, Microsoft Cyrillic encoding
++  <li> \c QFont::PT_154, Paratype Asian Cyrillic encoding
+   <li> \c QFont::Set_Ja, Japanese
+   <li> \c QFont::Set_Ko, Korean
+   <li> \c QFont::Set_Th_TH
+@@ -1016,11 +1018,16 @@
+         result = "iso8859-15";
+         break;
+     case QFont::KOI8R:
+-        result = "KOI8-R";
++        result = "koi8-r";
+         break;
+     case QFont::KOI8U:
+-        result = "KOI8-U";
++        result = "koi8-u";
+         break;
++    case QFont::CP_1251:
++        result = "cp1251";
++        break;
++    case QFont::PT_154:
++        result = "pt154";
+     case QFont::Set_Ja:
+         result = "Set_Ja";
+         break;
diff --git a/x11-toolkits/qt22/files/patch-am b/x11-toolkits/qt22/files/patch-am
new file mode 100644
index 000000000000..bea22e3b5906
--- /dev/null
+++ b/x11-toolkits/qt22/files/patch-am
@@ -0,0 +1,23 @@
+diff -ur src/kernel/qfont.h src/kernel/qfont.h
+--- src/kernel/qfont.h	Wed Oct  4 13:48:48 2000
++++ src/kernel/qfont.h	Mon Oct  9 11:53:48 2000
+@@ -70,6 +70,9 @@
+ 		     ISO_8859_14, Latin8 = ISO_8859_14,
+ 		     ISO_8859_15, Latin9 = ISO_8859_15,
+ 		     KOI8R,
++		     KOI8U,
++		     CP_1251,
++		     PT_154,
+ 		     Set_Ja, Set_1 = Set_Ja,
+ 		     Set_Ko,
+ 		     Set_Th_TH,
+@@ -96,8 +99,7 @@
+ 		     KSC_5601,
+ 		     GB_2312,
+ 		     Big5,
+-		     TSCII,
+-		     KOI8U
++		     TSCII
+     };
+     enum StyleHint { Helvetica, Times, Courier, OldEnglish,  System, AnyStyle,
+ 		     SansSerif	= Helvetica,
diff --git a/x11-toolkits/qt22/files/patch-an b/x11-toolkits/qt22/files/patch-an
new file mode 100644
index 000000000000..74b1d0cfa126
--- /dev/null
+++ b/x11-toolkits/qt22/files/patch-an
@@ -0,0 +1,60 @@
+diff -ur src/kernel/qfont_x11.cpp src/kernel/qfont_x11.cpp
+--- src/kernel/qfont_x11.cpp	Wed Oct  4 13:48:48 2000
++++ src/kernel/qfont_x11.cpp	Mon Oct  9 11:59:36 2000
+@@ -324,6 +324,9 @@
+     { "ISO 8859-14", QFont::ISO_8859_14 },
+     { "ISO 8859-15", QFont::ISO_8859_15 },
+     { "KOI8-R", QFont::KOI8R },
++    { "KOI8-U", QFont::KOI8U },
++    { "CP 1251", QFont::CP_1251 },
++    { "PT 154", QFont::PT_154 },
+     { "eucJP", QFont::Set_Ja },
+     { "SJIS", QFont::Set_Ja },
+     { "JIS7", QFont::Set_Ja },
+@@ -337,7 +340,6 @@
+     { "Big5", QFont::Set_Big5 },
+     { "ta_TA.TSCII", QFont::TSCII },
+     { "TSCII", QFont::TSCII },
+-    { "KOI8-U", QFont::KOI8U },
+     { 0, /* anything */ QFont::ISO_8859_1 }
+ };
+ 
+@@ -513,6 +515,12 @@
+     } else if( strcmp( tokens[CharsetRegistry], "koi8" ) == 0 &&
+ 	       strcmp( tokens[CharsetEncoding], "u" ) == 0) {
+ 	fd->charSet = QFont::KOI8U;
++    } else if( qstrcmp( tokens[CharsetEncoding], "cp1251" ) == 0 ||
++  	       (qstrcmp( tokens[CharsetEncoding], "1251" ) == 0 ) ) {
++  	fd->charSet = QFont::CP_1251;
++    } else if( qstrcmp( tokens[CharsetEncoding], "cp154" ) == 0 ||
++  	       (qstrcmp( tokens[CharsetEncoding], "154" ) == 0 ) ) {
++  	fd->charSet = QFont::PT_154;
+     } else if( qstrcmp( tokens[CharsetRegistry], "tscii" ) == 0 &&
+ 	       qstrcmp( tokens[CharsetEncoding], "0" ) == 0 ) {
+ 	fd->charSet = QFont::TSCII;
+@@ -1424,11 +1432,23 @@
+        else
+ 	       exactMatch = FALSE;
+     } else if ( charSet() == KOI8U ) {
+-       if ( strcmp( tokens[CharsetRegistry], "koi8" ) == 0 &&
+-	    strcmp( tokens[CharsetEncoding], "u" ) == 0 )
++       if ( qstrcmp( tokens[CharsetRegistry], "koi8" ) == 0 &&
++	    qstrcmp( tokens[CharsetEncoding], "u" ) == 0 )
+ 	    score |= CharSetScore;
+ 	else
+ 	    exactMatch = FALSE;
++    } else if ( charSet() == CP_1251 ) {
++        if  (qstrcmp( tokens[CharsetEncoding], "cp1251" ) == 0 ||
++                qstrcmp( tokens[CharsetEncoding], "1251" ) == 0) 
++                  score |= CharSetScore;
++          else
++                  exactMatch = FALSE;
++    } else if ( charSet() == PT_154 ) {
++        if  (qstrcmp( tokens[CharsetEncoding], "cp154" ) == 0 ||
++                qstrcmp( tokens[CharsetEncoding], "154" ) == 0) 
++                  score |= CharSetScore;
++          else
++                  exactMatch = FALSE;
+     } else if ( qstrcmp( tokens[CharsetRegistry], "iso8859" ) == 0 &&
+ 		charSet() >= ISO_8859_1 && charSet() <= ISO_8859_15 ) {
+ 	int i = 0;
diff --git a/x11-toolkits/qt22/files/patch-ao b/x11-toolkits/qt22/files/patch-ao
new file mode 100644
index 000000000000..58e5fd9dff99
--- /dev/null
+++ b/x11-toolkits/qt22/files/patch-ao
@@ -0,0 +1,85 @@
+diff -ur src/kernel/qfontdatabase.cpp src/kernel/qfontdatabase.cpp
+--- src/kernel/qfontdatabase.cpp	Wed Oct  4 13:48:48 2000
++++ src/kernel/qfontdatabase.cpp	Mon Oct  9 12:03:01 2000
+@@ -1280,9 +1280,15 @@
+ 		(qstrcmp( encoding, "r" ) == 0 ||
+ 		 qstrcmp( encoding, "1" ) == 0) ) {
+ 	return QFont::KOI8R;
+-    } else if ( strcmp( registry, "koi8" ) == 0 &&
++    } else if ( qstrcmp( registry, "koi8" ) == 0 &&
+ 		qstrcmp( encoding, "u" ) == 0) {
+ 	return QFont::KOI8U;
++    } else if ( qstrcmp( encoding, "cp1251" ) == 0 ||
++  		 qstrcmp( encoding, "1251" ) == 0)  {
++  	return QFont::CP_1251;
++    } else if ( qstrcmp( encoding, "cp154" ) == 0 ||
++  		 qstrcmp( encoding, "154" ) == 0)  {
++  	return QFont::PT_154;
+     } else if ( qstrcmp( registry, "tscii" ) == 0 &&
+ 		qstrcmp( encoding, "0" ) == 0 ) {
+ 	return QFont::TSCII;
+@@ -1334,6 +1340,14 @@
+         return QFont::KOI8R;
+     if ( name == "koi8-u" )
+         return QFont::KOI8U;
++    if ( name == "microsoft-cp1251" )
++	return QFont::CP_1251;
++    if ( name == "windows-1251" )
++ 	return QFont::CP_1251;
++    if ( name == "paratype-cp154" )
++	return QFont::PT_154;
++    if ( name == "paratype-154" )
++ 	return QFont::PT_154;
+     if ( name == "tis620-0" )
+         return QFont::TIS620;
+     if ( name == "tscii-0" )
+@@ -1380,6 +1394,10 @@
+         return "koi8-r";
+     case QFont::KOI8U:
+         return "koi8-u";
++    case QFont::CP_1251:
++        return "microsoft-cp1251";
++    case QFont::PT_154:
++        return "paratype-cp154";
+     case QFont::Unicode:
+         return "iso10646-1";
+     default:
+@@ -1448,11 +1466,17 @@
+         name = "French/Finnish/Euro(ISO 8859-15)";
+         break;
+     case QFont::KOI8R:
+-        name = "Cyrillic (KOI8-R)";
++        name = "Russian Cyrillic (KOI8-R)";
+         break;
+     case QFont::KOI8U:
+-        name = "Ukrainian (KOI8-U)";
++        name = "Ukrainian Cyrillic (KOI8-U)";
+         break;
++    case QFont::CP_1251:
++        name = "Windows Cyrillic (CP 1251)";
++        break;
++    case QFont::PT_154:
++        name = "Asian Cyrillic (PT 154)";
++	break;
+     case QFont::TSCII:
+ 	name = "Tamil (TSCII)";
+ 	break;
+@@ -1571,6 +1595,18 @@
+         sample += QChar(0x0436);
+         sample += QChar(0x2560);
+         break;
++    case QFont::CP_1251:
++ 	sample += QChar(0x0414);
++ 	sample += QChar(0x0490);
++ 	sample += QChar(0x040E);
++ 	sample += QChar(0x20AC);
++  	break;
++    case QFont::PT_154:
++ 	sample += QChar(0x0496);
++ 	sample += QChar(0x04E8);
++ 	sample += QChar(0x04D8);
++ 	sample += QChar(0x04AE);
++  	break;
+     case QFont::Unicode:
+         sample = "Aa";
+         sample += QChar(0x01A7); // Latin B
diff --git a/x11-toolkits/qt22/files/patch-ap b/x11-toolkits/qt22/files/patch-ap
new file mode 100644
index 000000000000..593ac76bdbbf
--- /dev/null
+++ b/x11-toolkits/qt22/files/patch-ap
@@ -0,0 +1,12 @@
+diff -ur src/kernel/qpsprinter.cpp src/kernel/qpsprinter.cpp
+--- src/kernel/qpsprinter.cpp	Wed Oct  4 13:48:49 2000
++++ src/kernel/qpsprinter.cpp	Mon Oct  9 11:53:48 2000
+@@ -1734,2 +1734,4 @@
+     { QFont::KOI8R, 2084 },
++    { QFont::KOI8U, 2088 },
++    { QFont::CP_1251, 2251 },
+     { QFont::ISO_8859_1, 4 },
+@@ -1747,2 +1749,3 @@
+     { QFont::ISO_8859_15, 111 },
++    { QFont::PT_154, 0 },
+     // makeFixedStrings() below assumes that this is last
diff --git a/x11-toolkits/qt22/files/patch-aq b/x11-toolkits/qt22/files/patch-aq
new file mode 100644
index 000000000000..4fd9441cb7a1
--- /dev/null
+++ b/x11-toolkits/qt22/files/patch-aq
@@ -0,0 +1,75 @@
+diff -ur src/tools/qtextcodec.cpp src/tools/qtextcodec.cpp
+--- src/tools/qtextcodec.cpp	Wed Oct  4 13:48:51 2000
++++ src/tools/qtextcodec.cpp	Mon Oct  9 11:53:48 2000
+@@ -451,7 +451,7 @@
+     "eo", 0 };
+ 
+ static const char * const iso8859_5locales[] = {
+-    "bg", "bg_BG", "bulgarian", "mk", "mk_MK",
++    "mk", "mk_MK",
+     "sp", "sp_YU", 0 };
+ 
+ static const char * const iso8859_6locales[] = {
+@@ -470,7 +470,14 @@
+     "fr", "fi", "french", "finnish", 0 };
+ 
+ static const char * const koi8_ulocales[] = {
+     "uk", "uk_UA", "ru_UA", "ukrainian", 0 };
++
++static const char * const cp_1251locales[] = {
++    "be", "be_BY", "bg", "bg_BG", "bulgarian", 0 };
++
++static const char * const pt_154locales[] = {
++    "ba_RU", "ky", "ky_KG", "kk", "kk_KZ", 0 };
++    
+ 
+ 
+ static bool try_locale_list( const char * const locale[], const char * lang )
+@@ -589,7 +596,11 @@
+             localeMapper = codecForName( "ISO 8859-15" );
+         else if ( try_locale_list( koi8_ulocales, lang ) )
+             localeMapper = codecForName( "KOI8-U" );
+-         else if ( try_locale_list( probably_koi8_rlocales, lang ) )
++        else if ( try_locale_list( cp_1251locales, lang ) )
++            localeMapper = codecForName( "CP 1251" );
++        else if ( try_locale_list( pt_154locales, lang ) )
++            localeMapper = codecForName( "PT 154" );
++        else if ( try_locale_list( probably_koi8_rlocales, lang ) )
+             localeMapper = ru_RU_hack( lang );
+         else if (!lang || !(localeMapper = codecForName(lang) ))
+             localeMapper = codecForName( "ISO 8859-1" );
+@@ -1626,6 +1637,23 @@
+               0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F,
+               0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447,
+               0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F} },
++    { "PT 154", 0,  // unknown mib
++        {     0x0496, 0x0492, 0x201A, 0x0493, 0x201E, 0x2026, 0x2020, 0x04AE,    
++	      0x04B2, 0x04AF, 0x04A0, 0x2039, 0x04A2, 0x049A, 0x04BA, 0x04B8,    
++	      0x0497, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,    
++	      0x04B3, 0x2122, 0x04A1, 0x203A, 0x04A3, 0x049B, 0x04BB, 0x04B9,    
++	      0x00A0, 0x040E, 0x045E, 0x0408, 0x04E8, 0x0498, 0x04B0, 0x00A7,
++	      0x0401, 0x00A9, 0x04D8, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x049C,
++	      0x00B0, 0x04B1, 0x0406, 0x0456, 0x0499, 0x04E9, 0x00B6, 0x00B7,
++	      0x0451, 0x2116, 0x04D9, 0x00BB, 0x0458, 0x04AA, 0x04AB, 0x049D,
++              0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,
++              0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F,
++              0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427,
++              0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F,
++              0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437,
++              0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F,
++              0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447,
++              0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F} },
+     { "CP 1252", 2252,
+         { 0x20AC, 0xFFFD, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
+               0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, 0xFFFD, 0x017D, 0xFFFD,
+@@ -1878,7 +1906,10 @@
+ 	if( !i )
+ 	    i = simpleHeuristicNameMatch("tis-620", hint);
+ 	if( i ) return i;
+-    }
++    } else if (( hint[0]=='m' ) && ( QCString(hint) == "microsoft-cp1251" ))
++         return QTextCodec::heuristicNameMatch("cp1251");
++    else if (( hint[0]=='w' ) && ( QCString(hint) == "windows-1251" ))
++         return QTextCodec::heuristicNameMatch("cp1251")-1;
+     return QTextCodec::heuristicNameMatch(hint);
+ }
diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile
index e7fc891de579..6c597d5eccc4 100644
--- a/x11-toolkits/qt23/Makefile
+++ b/x11-toolkits/qt23/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	qt
 PORTVERSION=	2.2.3
 .if exists(${X11BASE}/lib/libXft.so) && !defined(NO_AA)
-PORTREVISION=	1
+PORTREVISION=	2
 .endif
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
diff --git a/x11-toolkits/qt23/files/patch-al b/x11-toolkits/qt23/files/patch-al
new file mode 100644
index 000000000000..a7a86c62bc89
--- /dev/null
+++ b/x11-toolkits/qt23/files/patch-al
@@ -0,0 +1,31 @@
+diff -ur src/kernel/qfont.cpp src/kernel/qfont.cpp
+--- src/kernel/qfont.cpp	Wed Oct  4 13:48:48 2000
++++ src/kernel/qfont.cpp	Mon Oct  9 11:53:48 2000
+@@ -200,6 +200,8 @@
+    <li> \c QFont::KOI8U - KOI8-U, Cyrillic/Ukrainian, defined in
+        <a href="ftp://ftp.nordu.net/rfc/rfc2319.txt">RFC 2319.</a>
+    <li> \c QFont::AnyCharSet - whatever is handiest.
++  <li> \c QFont::CP_1251, Microsoft Cyrillic encoding
++  <li> \c QFont::PT_154, Paratype Asian Cyrillic encoding
+   <li> \c QFont::Set_Ja, Japanese
+   <li> \c QFont::Set_Ko, Korean
+   <li> \c QFont::Set_Th_TH
+@@ -1016,11 +1018,16 @@
+         result = "iso8859-15";
+         break;
+     case QFont::KOI8R:
+-        result = "KOI8-R";
++        result = "koi8-r";
+         break;
+     case QFont::KOI8U:
+-        result = "KOI8-U";
++        result = "koi8-u";
+         break;
++    case QFont::CP_1251:
++        result = "cp1251";
++        break;
++    case QFont::PT_154:
++        result = "pt154";
+     case QFont::Set_Ja:
+         result = "Set_Ja";
+         break;
diff --git a/x11-toolkits/qt23/files/patch-am b/x11-toolkits/qt23/files/patch-am
new file mode 100644
index 000000000000..bea22e3b5906
--- /dev/null
+++ b/x11-toolkits/qt23/files/patch-am
@@ -0,0 +1,23 @@
+diff -ur src/kernel/qfont.h src/kernel/qfont.h
+--- src/kernel/qfont.h	Wed Oct  4 13:48:48 2000
++++ src/kernel/qfont.h	Mon Oct  9 11:53:48 2000
+@@ -70,6 +70,9 @@
+ 		     ISO_8859_14, Latin8 = ISO_8859_14,
+ 		     ISO_8859_15, Latin9 = ISO_8859_15,
+ 		     KOI8R,
++		     KOI8U,
++		     CP_1251,
++		     PT_154,
+ 		     Set_Ja, Set_1 = Set_Ja,
+ 		     Set_Ko,
+ 		     Set_Th_TH,
+@@ -96,8 +99,7 @@
+ 		     KSC_5601,
+ 		     GB_2312,
+ 		     Big5,
+-		     TSCII,
+-		     KOI8U
++		     TSCII
+     };
+     enum StyleHint { Helvetica, Times, Courier, OldEnglish,  System, AnyStyle,
+ 		     SansSerif	= Helvetica,
diff --git a/x11-toolkits/qt23/files/patch-an b/x11-toolkits/qt23/files/patch-an
new file mode 100644
index 000000000000..74b1d0cfa126
--- /dev/null
+++ b/x11-toolkits/qt23/files/patch-an
@@ -0,0 +1,60 @@
+diff -ur src/kernel/qfont_x11.cpp src/kernel/qfont_x11.cpp
+--- src/kernel/qfont_x11.cpp	Wed Oct  4 13:48:48 2000
++++ src/kernel/qfont_x11.cpp	Mon Oct  9 11:59:36 2000
+@@ -324,6 +324,9 @@
+     { "ISO 8859-14", QFont::ISO_8859_14 },
+     { "ISO 8859-15", QFont::ISO_8859_15 },
+     { "KOI8-R", QFont::KOI8R },
++    { "KOI8-U", QFont::KOI8U },
++    { "CP 1251", QFont::CP_1251 },
++    { "PT 154", QFont::PT_154 },
+     { "eucJP", QFont::Set_Ja },
+     { "SJIS", QFont::Set_Ja },
+     { "JIS7", QFont::Set_Ja },
+@@ -337,7 +340,6 @@
+     { "Big5", QFont::Set_Big5 },
+     { "ta_TA.TSCII", QFont::TSCII },
+     { "TSCII", QFont::TSCII },
+-    { "KOI8-U", QFont::KOI8U },
+     { 0, /* anything */ QFont::ISO_8859_1 }
+ };
+ 
+@@ -513,6 +515,12 @@
+     } else if( strcmp( tokens[CharsetRegistry], "koi8" ) == 0 &&
+ 	       strcmp( tokens[CharsetEncoding], "u" ) == 0) {
+ 	fd->charSet = QFont::KOI8U;
++    } else if( qstrcmp( tokens[CharsetEncoding], "cp1251" ) == 0 ||
++  	       (qstrcmp( tokens[CharsetEncoding], "1251" ) == 0 ) ) {
++  	fd->charSet = QFont::CP_1251;
++    } else if( qstrcmp( tokens[CharsetEncoding], "cp154" ) == 0 ||
++  	       (qstrcmp( tokens[CharsetEncoding], "154" ) == 0 ) ) {
++  	fd->charSet = QFont::PT_154;
+     } else if( qstrcmp( tokens[CharsetRegistry], "tscii" ) == 0 &&
+ 	       qstrcmp( tokens[CharsetEncoding], "0" ) == 0 ) {
+ 	fd->charSet = QFont::TSCII;
+@@ -1424,11 +1432,23 @@
+        else
+ 	       exactMatch = FALSE;
+     } else if ( charSet() == KOI8U ) {
+-       if ( strcmp( tokens[CharsetRegistry], "koi8" ) == 0 &&
+-	    strcmp( tokens[CharsetEncoding], "u" ) == 0 )
++       if ( qstrcmp( tokens[CharsetRegistry], "koi8" ) == 0 &&
++	    qstrcmp( tokens[CharsetEncoding], "u" ) == 0 )
+ 	    score |= CharSetScore;
+ 	else
+ 	    exactMatch = FALSE;
++    } else if ( charSet() == CP_1251 ) {
++        if  (qstrcmp( tokens[CharsetEncoding], "cp1251" ) == 0 ||
++                qstrcmp( tokens[CharsetEncoding], "1251" ) == 0) 
++                  score |= CharSetScore;
++          else
++                  exactMatch = FALSE;
++    } else if ( charSet() == PT_154 ) {
++        if  (qstrcmp( tokens[CharsetEncoding], "cp154" ) == 0 ||
++                qstrcmp( tokens[CharsetEncoding], "154" ) == 0) 
++                  score |= CharSetScore;
++          else
++                  exactMatch = FALSE;
+     } else if ( qstrcmp( tokens[CharsetRegistry], "iso8859" ) == 0 &&
+ 		charSet() >= ISO_8859_1 && charSet() <= ISO_8859_15 ) {
+ 	int i = 0;
diff --git a/x11-toolkits/qt23/files/patch-ao b/x11-toolkits/qt23/files/patch-ao
new file mode 100644
index 000000000000..58e5fd9dff99
--- /dev/null
+++ b/x11-toolkits/qt23/files/patch-ao
@@ -0,0 +1,85 @@
+diff -ur src/kernel/qfontdatabase.cpp src/kernel/qfontdatabase.cpp
+--- src/kernel/qfontdatabase.cpp	Wed Oct  4 13:48:48 2000
++++ src/kernel/qfontdatabase.cpp	Mon Oct  9 12:03:01 2000
+@@ -1280,9 +1280,15 @@
+ 		(qstrcmp( encoding, "r" ) == 0 ||
+ 		 qstrcmp( encoding, "1" ) == 0) ) {
+ 	return QFont::KOI8R;
+-    } else if ( strcmp( registry, "koi8" ) == 0 &&
++    } else if ( qstrcmp( registry, "koi8" ) == 0 &&
+ 		qstrcmp( encoding, "u" ) == 0) {
+ 	return QFont::KOI8U;
++    } else if ( qstrcmp( encoding, "cp1251" ) == 0 ||
++  		 qstrcmp( encoding, "1251" ) == 0)  {
++  	return QFont::CP_1251;
++    } else if ( qstrcmp( encoding, "cp154" ) == 0 ||
++  		 qstrcmp( encoding, "154" ) == 0)  {
++  	return QFont::PT_154;
+     } else if ( qstrcmp( registry, "tscii" ) == 0 &&
+ 		qstrcmp( encoding, "0" ) == 0 ) {
+ 	return QFont::TSCII;
+@@ -1334,6 +1340,14 @@
+         return QFont::KOI8R;
+     if ( name == "koi8-u" )
+         return QFont::KOI8U;
++    if ( name == "microsoft-cp1251" )
++	return QFont::CP_1251;
++    if ( name == "windows-1251" )
++ 	return QFont::CP_1251;
++    if ( name == "paratype-cp154" )
++	return QFont::PT_154;
++    if ( name == "paratype-154" )
++ 	return QFont::PT_154;
+     if ( name == "tis620-0" )
+         return QFont::TIS620;
+     if ( name == "tscii-0" )
+@@ -1380,6 +1394,10 @@
+         return "koi8-r";
+     case QFont::KOI8U:
+         return "koi8-u";
++    case QFont::CP_1251:
++        return "microsoft-cp1251";
++    case QFont::PT_154:
++        return "paratype-cp154";
+     case QFont::Unicode:
+         return "iso10646-1";
+     default:
+@@ -1448,11 +1466,17 @@
+         name = "French/Finnish/Euro(ISO 8859-15)";
+         break;
+     case QFont::KOI8R:
+-        name = "Cyrillic (KOI8-R)";
++        name = "Russian Cyrillic (KOI8-R)";
+         break;
+     case QFont::KOI8U:
+-        name = "Ukrainian (KOI8-U)";
++        name = "Ukrainian Cyrillic (KOI8-U)";
+         break;
++    case QFont::CP_1251:
++        name = "Windows Cyrillic (CP 1251)";
++        break;
++    case QFont::PT_154:
++        name = "Asian Cyrillic (PT 154)";
++	break;
+     case QFont::TSCII:
+ 	name = "Tamil (TSCII)";
+ 	break;
+@@ -1571,6 +1595,18 @@
+         sample += QChar(0x0436);
+         sample += QChar(0x2560);
+         break;
++    case QFont::CP_1251:
++ 	sample += QChar(0x0414);
++ 	sample += QChar(0x0490);
++ 	sample += QChar(0x040E);
++ 	sample += QChar(0x20AC);
++  	break;
++    case QFont::PT_154:
++ 	sample += QChar(0x0496);
++ 	sample += QChar(0x04E8);
++ 	sample += QChar(0x04D8);
++ 	sample += QChar(0x04AE);
++  	break;
+     case QFont::Unicode:
+         sample = "Aa";
+         sample += QChar(0x01A7); // Latin B
diff --git a/x11-toolkits/qt23/files/patch-ap b/x11-toolkits/qt23/files/patch-ap
new file mode 100644
index 000000000000..593ac76bdbbf
--- /dev/null
+++ b/x11-toolkits/qt23/files/patch-ap
@@ -0,0 +1,12 @@
+diff -ur src/kernel/qpsprinter.cpp src/kernel/qpsprinter.cpp
+--- src/kernel/qpsprinter.cpp	Wed Oct  4 13:48:49 2000
++++ src/kernel/qpsprinter.cpp	Mon Oct  9 11:53:48 2000
+@@ -1734,2 +1734,4 @@
+     { QFont::KOI8R, 2084 },
++    { QFont::KOI8U, 2088 },
++    { QFont::CP_1251, 2251 },
+     { QFont::ISO_8859_1, 4 },
+@@ -1747,2 +1749,3 @@
+     { QFont::ISO_8859_15, 111 },
++    { QFont::PT_154, 0 },
+     // makeFixedStrings() below assumes that this is last
diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile
index e7fc891de579..6c597d5eccc4 100644
--- a/x11-toolkits/qt30/Makefile
+++ b/x11-toolkits/qt30/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	qt
 PORTVERSION=	2.2.3
 .if exists(${X11BASE}/lib/libXft.so) && !defined(NO_AA)
-PORTREVISION=	1
+PORTREVISION=	2
 .endif
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
diff --git a/x11-toolkits/qt30/files/patch-al b/x11-toolkits/qt30/files/patch-al
new file mode 100644
index 000000000000..a7a86c62bc89
--- /dev/null
+++ b/x11-toolkits/qt30/files/patch-al
@@ -0,0 +1,31 @@
+diff -ur src/kernel/qfont.cpp src/kernel/qfont.cpp
+--- src/kernel/qfont.cpp	Wed Oct  4 13:48:48 2000
++++ src/kernel/qfont.cpp	Mon Oct  9 11:53:48 2000
+@@ -200,6 +200,8 @@
+    <li> \c QFont::KOI8U - KOI8-U, Cyrillic/Ukrainian, defined in
+        <a href="ftp://ftp.nordu.net/rfc/rfc2319.txt">RFC 2319.</a>
+    <li> \c QFont::AnyCharSet - whatever is handiest.
++  <li> \c QFont::CP_1251, Microsoft Cyrillic encoding
++  <li> \c QFont::PT_154, Paratype Asian Cyrillic encoding
+   <li> \c QFont::Set_Ja, Japanese
+   <li> \c QFont::Set_Ko, Korean
+   <li> \c QFont::Set_Th_TH
+@@ -1016,11 +1018,16 @@
+         result = "iso8859-15";
+         break;
+     case QFont::KOI8R:
+-        result = "KOI8-R";
++        result = "koi8-r";
+         break;
+     case QFont::KOI8U:
+-        result = "KOI8-U";
++        result = "koi8-u";
+         break;
++    case QFont::CP_1251:
++        result = "cp1251";
++        break;
++    case QFont::PT_154:
++        result = "pt154";
+     case QFont::Set_Ja:
+         result = "Set_Ja";
+         break;
diff --git a/x11-toolkits/qt30/files/patch-am b/x11-toolkits/qt30/files/patch-am
new file mode 100644
index 000000000000..bea22e3b5906
--- /dev/null
+++ b/x11-toolkits/qt30/files/patch-am
@@ -0,0 +1,23 @@
+diff -ur src/kernel/qfont.h src/kernel/qfont.h
+--- src/kernel/qfont.h	Wed Oct  4 13:48:48 2000
++++ src/kernel/qfont.h	Mon Oct  9 11:53:48 2000
+@@ -70,6 +70,9 @@
+ 		     ISO_8859_14, Latin8 = ISO_8859_14,
+ 		     ISO_8859_15, Latin9 = ISO_8859_15,
+ 		     KOI8R,
++		     KOI8U,
++		     CP_1251,
++		     PT_154,
+ 		     Set_Ja, Set_1 = Set_Ja,
+ 		     Set_Ko,
+ 		     Set_Th_TH,
+@@ -96,8 +99,7 @@
+ 		     KSC_5601,
+ 		     GB_2312,
+ 		     Big5,
+-		     TSCII,
+-		     KOI8U
++		     TSCII
+     };
+     enum StyleHint { Helvetica, Times, Courier, OldEnglish,  System, AnyStyle,
+ 		     SansSerif	= Helvetica,
diff --git a/x11-toolkits/qt30/files/patch-an b/x11-toolkits/qt30/files/patch-an
new file mode 100644
index 000000000000..74b1d0cfa126
--- /dev/null
+++ b/x11-toolkits/qt30/files/patch-an
@@ -0,0 +1,60 @@
+diff -ur src/kernel/qfont_x11.cpp src/kernel/qfont_x11.cpp
+--- src/kernel/qfont_x11.cpp	Wed Oct  4 13:48:48 2000
++++ src/kernel/qfont_x11.cpp	Mon Oct  9 11:59:36 2000
+@@ -324,6 +324,9 @@
+     { "ISO 8859-14", QFont::ISO_8859_14 },
+     { "ISO 8859-15", QFont::ISO_8859_15 },
+     { "KOI8-R", QFont::KOI8R },
++    { "KOI8-U", QFont::KOI8U },
++    { "CP 1251", QFont::CP_1251 },
++    { "PT 154", QFont::PT_154 },
+     { "eucJP", QFont::Set_Ja },
+     { "SJIS", QFont::Set_Ja },
+     { "JIS7", QFont::Set_Ja },
+@@ -337,7 +340,6 @@
+     { "Big5", QFont::Set_Big5 },
+     { "ta_TA.TSCII", QFont::TSCII },
+     { "TSCII", QFont::TSCII },
+-    { "KOI8-U", QFont::KOI8U },
+     { 0, /* anything */ QFont::ISO_8859_1 }
+ };
+ 
+@@ -513,6 +515,12 @@
+     } else if( strcmp( tokens[CharsetRegistry], "koi8" ) == 0 &&
+ 	       strcmp( tokens[CharsetEncoding], "u" ) == 0) {
+ 	fd->charSet = QFont::KOI8U;
++    } else if( qstrcmp( tokens[CharsetEncoding], "cp1251" ) == 0 ||
++  	       (qstrcmp( tokens[CharsetEncoding], "1251" ) == 0 ) ) {
++  	fd->charSet = QFont::CP_1251;
++    } else if( qstrcmp( tokens[CharsetEncoding], "cp154" ) == 0 ||
++  	       (qstrcmp( tokens[CharsetEncoding], "154" ) == 0 ) ) {
++  	fd->charSet = QFont::PT_154;
+     } else if( qstrcmp( tokens[CharsetRegistry], "tscii" ) == 0 &&
+ 	       qstrcmp( tokens[CharsetEncoding], "0" ) == 0 ) {
+ 	fd->charSet = QFont::TSCII;
+@@ -1424,11 +1432,23 @@
+        else
+ 	       exactMatch = FALSE;
+     } else if ( charSet() == KOI8U ) {
+-       if ( strcmp( tokens[CharsetRegistry], "koi8" ) == 0 &&
+-	    strcmp( tokens[CharsetEncoding], "u" ) == 0 )
++       if ( qstrcmp( tokens[CharsetRegistry], "koi8" ) == 0 &&
++	    qstrcmp( tokens[CharsetEncoding], "u" ) == 0 )
+ 	    score |= CharSetScore;
+ 	else
+ 	    exactMatch = FALSE;
++    } else if ( charSet() == CP_1251 ) {
++        if  (qstrcmp( tokens[CharsetEncoding], "cp1251" ) == 0 ||
++                qstrcmp( tokens[CharsetEncoding], "1251" ) == 0) 
++                  score |= CharSetScore;
++          else
++                  exactMatch = FALSE;
++    } else if ( charSet() == PT_154 ) {
++        if  (qstrcmp( tokens[CharsetEncoding], "cp154" ) == 0 ||
++                qstrcmp( tokens[CharsetEncoding], "154" ) == 0) 
++                  score |= CharSetScore;
++          else
++                  exactMatch = FALSE;
+     } else if ( qstrcmp( tokens[CharsetRegistry], "iso8859" ) == 0 &&
+ 		charSet() >= ISO_8859_1 && charSet() <= ISO_8859_15 ) {
+ 	int i = 0;
diff --git a/x11-toolkits/qt30/files/patch-ao b/x11-toolkits/qt30/files/patch-ao
new file mode 100644
index 000000000000..58e5fd9dff99
--- /dev/null
+++ b/x11-toolkits/qt30/files/patch-ao
@@ -0,0 +1,85 @@
+diff -ur src/kernel/qfontdatabase.cpp src/kernel/qfontdatabase.cpp
+--- src/kernel/qfontdatabase.cpp	Wed Oct  4 13:48:48 2000
++++ src/kernel/qfontdatabase.cpp	Mon Oct  9 12:03:01 2000
+@@ -1280,9 +1280,15 @@
+ 		(qstrcmp( encoding, "r" ) == 0 ||
+ 		 qstrcmp( encoding, "1" ) == 0) ) {
+ 	return QFont::KOI8R;
+-    } else if ( strcmp( registry, "koi8" ) == 0 &&
++    } else if ( qstrcmp( registry, "koi8" ) == 0 &&
+ 		qstrcmp( encoding, "u" ) == 0) {
+ 	return QFont::KOI8U;
++    } else if ( qstrcmp( encoding, "cp1251" ) == 0 ||
++  		 qstrcmp( encoding, "1251" ) == 0)  {
++  	return QFont::CP_1251;
++    } else if ( qstrcmp( encoding, "cp154" ) == 0 ||
++  		 qstrcmp( encoding, "154" ) == 0)  {
++  	return QFont::PT_154;
+     } else if ( qstrcmp( registry, "tscii" ) == 0 &&
+ 		qstrcmp( encoding, "0" ) == 0 ) {
+ 	return QFont::TSCII;
+@@ -1334,6 +1340,14 @@
+         return QFont::KOI8R;
+     if ( name == "koi8-u" )
+         return QFont::KOI8U;
++    if ( name == "microsoft-cp1251" )
++	return QFont::CP_1251;
++    if ( name == "windows-1251" )
++ 	return QFont::CP_1251;
++    if ( name == "paratype-cp154" )
++	return QFont::PT_154;
++    if ( name == "paratype-154" )
++ 	return QFont::PT_154;
+     if ( name == "tis620-0" )
+         return QFont::TIS620;
+     if ( name == "tscii-0" )
+@@ -1380,6 +1394,10 @@
+         return "koi8-r";
+     case QFont::KOI8U:
+         return "koi8-u";
++    case QFont::CP_1251:
++        return "microsoft-cp1251";
++    case QFont::PT_154:
++        return "paratype-cp154";
+     case QFont::Unicode:
+         return "iso10646-1";
+     default:
+@@ -1448,11 +1466,17 @@
+         name = "French/Finnish/Euro(ISO 8859-15)";
+         break;
+     case QFont::KOI8R:
+-        name = "Cyrillic (KOI8-R)";
++        name = "Russian Cyrillic (KOI8-R)";
+         break;
+     case QFont::KOI8U:
+-        name = "Ukrainian (KOI8-U)";
++        name = "Ukrainian Cyrillic (KOI8-U)";
+         break;
++    case QFont::CP_1251:
++        name = "Windows Cyrillic (CP 1251)";
++        break;
++    case QFont::PT_154:
++        name = "Asian Cyrillic (PT 154)";
++	break;
+     case QFont::TSCII:
+ 	name = "Tamil (TSCII)";
+ 	break;
+@@ -1571,6 +1595,18 @@
+         sample += QChar(0x0436);
+         sample += QChar(0x2560);
+         break;
++    case QFont::CP_1251:
++ 	sample += QChar(0x0414);
++ 	sample += QChar(0x0490);
++ 	sample += QChar(0x040E);
++ 	sample += QChar(0x20AC);
++  	break;
++    case QFont::PT_154:
++ 	sample += QChar(0x0496);
++ 	sample += QChar(0x04E8);
++ 	sample += QChar(0x04D8);
++ 	sample += QChar(0x04AE);
++  	break;
+     case QFont::Unicode:
+         sample = "Aa";
+         sample += QChar(0x01A7); // Latin B
diff --git a/x11-toolkits/qt30/files/patch-ap b/x11-toolkits/qt30/files/patch-ap
new file mode 100644
index 000000000000..593ac76bdbbf
--- /dev/null
+++ b/x11-toolkits/qt30/files/patch-ap
@@ -0,0 +1,12 @@
+diff -ur src/kernel/qpsprinter.cpp src/kernel/qpsprinter.cpp
+--- src/kernel/qpsprinter.cpp	Wed Oct  4 13:48:49 2000
++++ src/kernel/qpsprinter.cpp	Mon Oct  9 11:53:48 2000
+@@ -1734,2 +1734,4 @@
+     { QFont::KOI8R, 2084 },
++    { QFont::KOI8U, 2088 },
++    { QFont::CP_1251, 2251 },
+     { QFont::ISO_8859_1, 4 },
+@@ -1747,2 +1749,3 @@
+     { QFont::ISO_8859_15, 111 },
++    { QFont::PT_154, 0 },
+     // makeFixedStrings() below assumes that this is last
diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index e7fc891de579..6c597d5eccc4 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	qt
 PORTVERSION=	2.2.3
 .if exists(${X11BASE}/lib/libXft.so) && !defined(NO_AA)
-PORTREVISION=	1
+PORTREVISION=	2
 .endif
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
diff --git a/x11-toolkits/qt31/files/patch-al b/x11-toolkits/qt31/files/patch-al
new file mode 100644
index 000000000000..a7a86c62bc89
--- /dev/null
+++ b/x11-toolkits/qt31/files/patch-al
@@ -0,0 +1,31 @@
+diff -ur src/kernel/qfont.cpp src/kernel/qfont.cpp
+--- src/kernel/qfont.cpp	Wed Oct  4 13:48:48 2000
++++ src/kernel/qfont.cpp	Mon Oct  9 11:53:48 2000
+@@ -200,6 +200,8 @@
+    <li> \c QFont::KOI8U - KOI8-U, Cyrillic/Ukrainian, defined in
+        <a href="ftp://ftp.nordu.net/rfc/rfc2319.txt">RFC 2319.</a>
+    <li> \c QFont::AnyCharSet - whatever is handiest.
++  <li> \c QFont::CP_1251, Microsoft Cyrillic encoding
++  <li> \c QFont::PT_154, Paratype Asian Cyrillic encoding
+   <li> \c QFont::Set_Ja, Japanese
+   <li> \c QFont::Set_Ko, Korean
+   <li> \c QFont::Set_Th_TH
+@@ -1016,11 +1018,16 @@
+         result = "iso8859-15";
+         break;
+     case QFont::KOI8R:
+-        result = "KOI8-R";
++        result = "koi8-r";
+         break;
+     case QFont::KOI8U:
+-        result = "KOI8-U";
++        result = "koi8-u";
+         break;
++    case QFont::CP_1251:
++        result = "cp1251";
++        break;
++    case QFont::PT_154:
++        result = "pt154";
+     case QFont::Set_Ja:
+         result = "Set_Ja";
+         break;
diff --git a/x11-toolkits/qt31/files/patch-am b/x11-toolkits/qt31/files/patch-am
new file mode 100644
index 000000000000..bea22e3b5906
--- /dev/null
+++ b/x11-toolkits/qt31/files/patch-am
@@ -0,0 +1,23 @@
+diff -ur src/kernel/qfont.h src/kernel/qfont.h
+--- src/kernel/qfont.h	Wed Oct  4 13:48:48 2000
++++ src/kernel/qfont.h	Mon Oct  9 11:53:48 2000
+@@ -70,6 +70,9 @@
+ 		     ISO_8859_14, Latin8 = ISO_8859_14,
+ 		     ISO_8859_15, Latin9 = ISO_8859_15,
+ 		     KOI8R,
++		     KOI8U,
++		     CP_1251,
++		     PT_154,
+ 		     Set_Ja, Set_1 = Set_Ja,
+ 		     Set_Ko,
+ 		     Set_Th_TH,
+@@ -96,8 +99,7 @@
+ 		     KSC_5601,
+ 		     GB_2312,
+ 		     Big5,
+-		     TSCII,
+-		     KOI8U
++		     TSCII
+     };
+     enum StyleHint { Helvetica, Times, Courier, OldEnglish,  System, AnyStyle,
+ 		     SansSerif	= Helvetica,
diff --git a/x11-toolkits/qt31/files/patch-an b/x11-toolkits/qt31/files/patch-an
new file mode 100644
index 000000000000..74b1d0cfa126
--- /dev/null
+++ b/x11-toolkits/qt31/files/patch-an
@@ -0,0 +1,60 @@
+diff -ur src/kernel/qfont_x11.cpp src/kernel/qfont_x11.cpp
+--- src/kernel/qfont_x11.cpp	Wed Oct  4 13:48:48 2000
++++ src/kernel/qfont_x11.cpp	Mon Oct  9 11:59:36 2000
+@@ -324,6 +324,9 @@
+     { "ISO 8859-14", QFont::ISO_8859_14 },
+     { "ISO 8859-15", QFont::ISO_8859_15 },
+     { "KOI8-R", QFont::KOI8R },
++    { "KOI8-U", QFont::KOI8U },
++    { "CP 1251", QFont::CP_1251 },
++    { "PT 154", QFont::PT_154 },
+     { "eucJP", QFont::Set_Ja },
+     { "SJIS", QFont::Set_Ja },
+     { "JIS7", QFont::Set_Ja },
+@@ -337,7 +340,6 @@
+     { "Big5", QFont::Set_Big5 },
+     { "ta_TA.TSCII", QFont::TSCII },
+     { "TSCII", QFont::TSCII },
+-    { "KOI8-U", QFont::KOI8U },
+     { 0, /* anything */ QFont::ISO_8859_1 }
+ };
+ 
+@@ -513,6 +515,12 @@
+     } else if( strcmp( tokens[CharsetRegistry], "koi8" ) == 0 &&
+ 	       strcmp( tokens[CharsetEncoding], "u" ) == 0) {
+ 	fd->charSet = QFont::KOI8U;
++    } else if( qstrcmp( tokens[CharsetEncoding], "cp1251" ) == 0 ||
++  	       (qstrcmp( tokens[CharsetEncoding], "1251" ) == 0 ) ) {
++  	fd->charSet = QFont::CP_1251;
++    } else if( qstrcmp( tokens[CharsetEncoding], "cp154" ) == 0 ||
++  	       (qstrcmp( tokens[CharsetEncoding], "154" ) == 0 ) ) {
++  	fd->charSet = QFont::PT_154;
+     } else if( qstrcmp( tokens[CharsetRegistry], "tscii" ) == 0 &&
+ 	       qstrcmp( tokens[CharsetEncoding], "0" ) == 0 ) {
+ 	fd->charSet = QFont::TSCII;
+@@ -1424,11 +1432,23 @@
+        else
+ 	       exactMatch = FALSE;
+     } else if ( charSet() == KOI8U ) {
+-       if ( strcmp( tokens[CharsetRegistry], "koi8" ) == 0 &&
+-	    strcmp( tokens[CharsetEncoding], "u" ) == 0 )
++       if ( qstrcmp( tokens[CharsetRegistry], "koi8" ) == 0 &&
++	    qstrcmp( tokens[CharsetEncoding], "u" ) == 0 )
+ 	    score |= CharSetScore;
+ 	else
+ 	    exactMatch = FALSE;
++    } else if ( charSet() == CP_1251 ) {
++        if  (qstrcmp( tokens[CharsetEncoding], "cp1251" ) == 0 ||
++                qstrcmp( tokens[CharsetEncoding], "1251" ) == 0) 
++                  score |= CharSetScore;
++          else
++                  exactMatch = FALSE;
++    } else if ( charSet() == PT_154 ) {
++        if  (qstrcmp( tokens[CharsetEncoding], "cp154" ) == 0 ||
++                qstrcmp( tokens[CharsetEncoding], "154" ) == 0) 
++                  score |= CharSetScore;
++          else
++                  exactMatch = FALSE;
+     } else if ( qstrcmp( tokens[CharsetRegistry], "iso8859" ) == 0 &&
+ 		charSet() >= ISO_8859_1 && charSet() <= ISO_8859_15 ) {
+ 	int i = 0;
diff --git a/x11-toolkits/qt31/files/patch-ao b/x11-toolkits/qt31/files/patch-ao
new file mode 100644
index 000000000000..58e5fd9dff99
--- /dev/null
+++ b/x11-toolkits/qt31/files/patch-ao
@@ -0,0 +1,85 @@
+diff -ur src/kernel/qfontdatabase.cpp src/kernel/qfontdatabase.cpp
+--- src/kernel/qfontdatabase.cpp	Wed Oct  4 13:48:48 2000
++++ src/kernel/qfontdatabase.cpp	Mon Oct  9 12:03:01 2000
+@@ -1280,9 +1280,15 @@
+ 		(qstrcmp( encoding, "r" ) == 0 ||
+ 		 qstrcmp( encoding, "1" ) == 0) ) {
+ 	return QFont::KOI8R;
+-    } else if ( strcmp( registry, "koi8" ) == 0 &&
++    } else if ( qstrcmp( registry, "koi8" ) == 0 &&
+ 		qstrcmp( encoding, "u" ) == 0) {
+ 	return QFont::KOI8U;
++    } else if ( qstrcmp( encoding, "cp1251" ) == 0 ||
++  		 qstrcmp( encoding, "1251" ) == 0)  {
++  	return QFont::CP_1251;
++    } else if ( qstrcmp( encoding, "cp154" ) == 0 ||
++  		 qstrcmp( encoding, "154" ) == 0)  {
++  	return QFont::PT_154;
+     } else if ( qstrcmp( registry, "tscii" ) == 0 &&
+ 		qstrcmp( encoding, "0" ) == 0 ) {
+ 	return QFont::TSCII;
+@@ -1334,6 +1340,14 @@
+         return QFont::KOI8R;
+     if ( name == "koi8-u" )
+         return QFont::KOI8U;
++    if ( name == "microsoft-cp1251" )
++	return QFont::CP_1251;
++    if ( name == "windows-1251" )
++ 	return QFont::CP_1251;
++    if ( name == "paratype-cp154" )
++	return QFont::PT_154;
++    if ( name == "paratype-154" )
++ 	return QFont::PT_154;
+     if ( name == "tis620-0" )
+         return QFont::TIS620;
+     if ( name == "tscii-0" )
+@@ -1380,6 +1394,10 @@
+         return "koi8-r";
+     case QFont::KOI8U:
+         return "koi8-u";
++    case QFont::CP_1251:
++        return "microsoft-cp1251";
++    case QFont::PT_154:
++        return "paratype-cp154";
+     case QFont::Unicode:
+         return "iso10646-1";
+     default:
+@@ -1448,11 +1466,17 @@
+         name = "French/Finnish/Euro(ISO 8859-15)";
+         break;
+     case QFont::KOI8R:
+-        name = "Cyrillic (KOI8-R)";
++        name = "Russian Cyrillic (KOI8-R)";
+         break;
+     case QFont::KOI8U:
+-        name = "Ukrainian (KOI8-U)";
++        name = "Ukrainian Cyrillic (KOI8-U)";
+         break;
++    case QFont::CP_1251:
++        name = "Windows Cyrillic (CP 1251)";
++        break;
++    case QFont::PT_154:
++        name = "Asian Cyrillic (PT 154)";
++	break;
+     case QFont::TSCII:
+ 	name = "Tamil (TSCII)";
+ 	break;
+@@ -1571,6 +1595,18 @@
+         sample += QChar(0x0436);
+         sample += QChar(0x2560);
+         break;
++    case QFont::CP_1251:
++ 	sample += QChar(0x0414);
++ 	sample += QChar(0x0490);
++ 	sample += QChar(0x040E);
++ 	sample += QChar(0x20AC);
++  	break;
++    case QFont::PT_154:
++ 	sample += QChar(0x0496);
++ 	sample += QChar(0x04E8);
++ 	sample += QChar(0x04D8);
++ 	sample += QChar(0x04AE);
++  	break;
+     case QFont::Unicode:
+         sample = "Aa";
+         sample += QChar(0x01A7); // Latin B
diff --git a/x11-toolkits/qt31/files/patch-ap b/x11-toolkits/qt31/files/patch-ap
new file mode 100644
index 000000000000..593ac76bdbbf
--- /dev/null
+++ b/x11-toolkits/qt31/files/patch-ap
@@ -0,0 +1,12 @@
+diff -ur src/kernel/qpsprinter.cpp src/kernel/qpsprinter.cpp
+--- src/kernel/qpsprinter.cpp	Wed Oct  4 13:48:49 2000
++++ src/kernel/qpsprinter.cpp	Mon Oct  9 11:53:48 2000
+@@ -1734,2 +1734,4 @@
+     { QFont::KOI8R, 2084 },
++    { QFont::KOI8U, 2088 },
++    { QFont::CP_1251, 2251 },
+     { QFont::ISO_8859_1, 4 },
+@@ -1747,2 +1749,3 @@
+     { QFont::ISO_8859_15, 111 },
++    { QFont::PT_154, 0 },
+     // makeFixedStrings() below assumes that this is last
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index e7fc891de579..6c597d5eccc4 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	qt
 PORTVERSION=	2.2.3
 .if exists(${X11BASE}/lib/libXft.so) && !defined(NO_AA)
-PORTREVISION=	1
+PORTREVISION=	2
 .endif
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
diff --git a/x11-toolkits/qt32/files/patch-al b/x11-toolkits/qt32/files/patch-al
new file mode 100644
index 000000000000..a7a86c62bc89
--- /dev/null
+++ b/x11-toolkits/qt32/files/patch-al
@@ -0,0 +1,31 @@
+diff -ur src/kernel/qfont.cpp src/kernel/qfont.cpp
+--- src/kernel/qfont.cpp	Wed Oct  4 13:48:48 2000
++++ src/kernel/qfont.cpp	Mon Oct  9 11:53:48 2000
+@@ -200,6 +200,8 @@
+    <li> \c QFont::KOI8U - KOI8-U, Cyrillic/Ukrainian, defined in
+        <a href="ftp://ftp.nordu.net/rfc/rfc2319.txt">RFC 2319.</a>
+    <li> \c QFont::AnyCharSet - whatever is handiest.
++  <li> \c QFont::CP_1251, Microsoft Cyrillic encoding
++  <li> \c QFont::PT_154, Paratype Asian Cyrillic encoding
+   <li> \c QFont::Set_Ja, Japanese
+   <li> \c QFont::Set_Ko, Korean
+   <li> \c QFont::Set_Th_TH
+@@ -1016,11 +1018,16 @@
+         result = "iso8859-15";
+         break;
+     case QFont::KOI8R:
+-        result = "KOI8-R";
++        result = "koi8-r";
+         break;
+     case QFont::KOI8U:
+-        result = "KOI8-U";
++        result = "koi8-u";
+         break;
++    case QFont::CP_1251:
++        result = "cp1251";
++        break;
++    case QFont::PT_154:
++        result = "pt154";
+     case QFont::Set_Ja:
+         result = "Set_Ja";
+         break;
diff --git a/x11-toolkits/qt32/files/patch-am b/x11-toolkits/qt32/files/patch-am
new file mode 100644
index 000000000000..bea22e3b5906
--- /dev/null
+++ b/x11-toolkits/qt32/files/patch-am
@@ -0,0 +1,23 @@
+diff -ur src/kernel/qfont.h src/kernel/qfont.h
+--- src/kernel/qfont.h	Wed Oct  4 13:48:48 2000
++++ src/kernel/qfont.h	Mon Oct  9 11:53:48 2000
+@@ -70,6 +70,9 @@
+ 		     ISO_8859_14, Latin8 = ISO_8859_14,
+ 		     ISO_8859_15, Latin9 = ISO_8859_15,
+ 		     KOI8R,
++		     KOI8U,
++		     CP_1251,
++		     PT_154,
+ 		     Set_Ja, Set_1 = Set_Ja,
+ 		     Set_Ko,
+ 		     Set_Th_TH,
+@@ -96,8 +99,7 @@
+ 		     KSC_5601,
+ 		     GB_2312,
+ 		     Big5,
+-		     TSCII,
+-		     KOI8U
++		     TSCII
+     };
+     enum StyleHint { Helvetica, Times, Courier, OldEnglish,  System, AnyStyle,
+ 		     SansSerif	= Helvetica,
diff --git a/x11-toolkits/qt32/files/patch-an b/x11-toolkits/qt32/files/patch-an
new file mode 100644
index 000000000000..74b1d0cfa126
--- /dev/null
+++ b/x11-toolkits/qt32/files/patch-an
@@ -0,0 +1,60 @@
+diff -ur src/kernel/qfont_x11.cpp src/kernel/qfont_x11.cpp
+--- src/kernel/qfont_x11.cpp	Wed Oct  4 13:48:48 2000
++++ src/kernel/qfont_x11.cpp	Mon Oct  9 11:59:36 2000
+@@ -324,6 +324,9 @@
+     { "ISO 8859-14", QFont::ISO_8859_14 },
+     { "ISO 8859-15", QFont::ISO_8859_15 },
+     { "KOI8-R", QFont::KOI8R },
++    { "KOI8-U", QFont::KOI8U },
++    { "CP 1251", QFont::CP_1251 },
++    { "PT 154", QFont::PT_154 },
+     { "eucJP", QFont::Set_Ja },
+     { "SJIS", QFont::Set_Ja },
+     { "JIS7", QFont::Set_Ja },
+@@ -337,7 +340,6 @@
+     { "Big5", QFont::Set_Big5 },
+     { "ta_TA.TSCII", QFont::TSCII },
+     { "TSCII", QFont::TSCII },
+-    { "KOI8-U", QFont::KOI8U },
+     { 0, /* anything */ QFont::ISO_8859_1 }
+ };
+ 
+@@ -513,6 +515,12 @@
+     } else if( strcmp( tokens[CharsetRegistry], "koi8" ) == 0 &&
+ 	       strcmp( tokens[CharsetEncoding], "u" ) == 0) {
+ 	fd->charSet = QFont::KOI8U;
++    } else if( qstrcmp( tokens[CharsetEncoding], "cp1251" ) == 0 ||
++  	       (qstrcmp( tokens[CharsetEncoding], "1251" ) == 0 ) ) {
++  	fd->charSet = QFont::CP_1251;
++    } else if( qstrcmp( tokens[CharsetEncoding], "cp154" ) == 0 ||
++  	       (qstrcmp( tokens[CharsetEncoding], "154" ) == 0 ) ) {
++  	fd->charSet = QFont::PT_154;
+     } else if( qstrcmp( tokens[CharsetRegistry], "tscii" ) == 0 &&
+ 	       qstrcmp( tokens[CharsetEncoding], "0" ) == 0 ) {
+ 	fd->charSet = QFont::TSCII;
+@@ -1424,11 +1432,23 @@
+        else
+ 	       exactMatch = FALSE;
+     } else if ( charSet() == KOI8U ) {
+-       if ( strcmp( tokens[CharsetRegistry], "koi8" ) == 0 &&
+-	    strcmp( tokens[CharsetEncoding], "u" ) == 0 )
++       if ( qstrcmp( tokens[CharsetRegistry], "koi8" ) == 0 &&
++	    qstrcmp( tokens[CharsetEncoding], "u" ) == 0 )
+ 	    score |= CharSetScore;
+ 	else
+ 	    exactMatch = FALSE;
++    } else if ( charSet() == CP_1251 ) {
++        if  (qstrcmp( tokens[CharsetEncoding], "cp1251" ) == 0 ||
++                qstrcmp( tokens[CharsetEncoding], "1251" ) == 0) 
++                  score |= CharSetScore;
++          else
++                  exactMatch = FALSE;
++    } else if ( charSet() == PT_154 ) {
++        if  (qstrcmp( tokens[CharsetEncoding], "cp154" ) == 0 ||
++                qstrcmp( tokens[CharsetEncoding], "154" ) == 0) 
++                  score |= CharSetScore;
++          else
++                  exactMatch = FALSE;
+     } else if ( qstrcmp( tokens[CharsetRegistry], "iso8859" ) == 0 &&
+ 		charSet() >= ISO_8859_1 && charSet() <= ISO_8859_15 ) {
+ 	int i = 0;
diff --git a/x11-toolkits/qt32/files/patch-ao b/x11-toolkits/qt32/files/patch-ao
new file mode 100644
index 000000000000..58e5fd9dff99
--- /dev/null
+++ b/x11-toolkits/qt32/files/patch-ao
@@ -0,0 +1,85 @@
+diff -ur src/kernel/qfontdatabase.cpp src/kernel/qfontdatabase.cpp
+--- src/kernel/qfontdatabase.cpp	Wed Oct  4 13:48:48 2000
++++ src/kernel/qfontdatabase.cpp	Mon Oct  9 12:03:01 2000
+@@ -1280,9 +1280,15 @@
+ 		(qstrcmp( encoding, "r" ) == 0 ||
+ 		 qstrcmp( encoding, "1" ) == 0) ) {
+ 	return QFont::KOI8R;
+-    } else if ( strcmp( registry, "koi8" ) == 0 &&
++    } else if ( qstrcmp( registry, "koi8" ) == 0 &&
+ 		qstrcmp( encoding, "u" ) == 0) {
+ 	return QFont::KOI8U;
++    } else if ( qstrcmp( encoding, "cp1251" ) == 0 ||
++  		 qstrcmp( encoding, "1251" ) == 0)  {
++  	return QFont::CP_1251;
++    } else if ( qstrcmp( encoding, "cp154" ) == 0 ||
++  		 qstrcmp( encoding, "154" ) == 0)  {
++  	return QFont::PT_154;
+     } else if ( qstrcmp( registry, "tscii" ) == 0 &&
+ 		qstrcmp( encoding, "0" ) == 0 ) {
+ 	return QFont::TSCII;
+@@ -1334,6 +1340,14 @@
+         return QFont::KOI8R;
+     if ( name == "koi8-u" )
+         return QFont::KOI8U;
++    if ( name == "microsoft-cp1251" )
++	return QFont::CP_1251;
++    if ( name == "windows-1251" )
++ 	return QFont::CP_1251;
++    if ( name == "paratype-cp154" )
++	return QFont::PT_154;
++    if ( name == "paratype-154" )
++ 	return QFont::PT_154;
+     if ( name == "tis620-0" )
+         return QFont::TIS620;
+     if ( name == "tscii-0" )
+@@ -1380,6 +1394,10 @@
+         return "koi8-r";
+     case QFont::KOI8U:
+         return "koi8-u";
++    case QFont::CP_1251:
++        return "microsoft-cp1251";
++    case QFont::PT_154:
++        return "paratype-cp154";
+     case QFont::Unicode:
+         return "iso10646-1";
+     default:
+@@ -1448,11 +1466,17 @@
+         name = "French/Finnish/Euro(ISO 8859-15)";
+         break;
+     case QFont::KOI8R:
+-        name = "Cyrillic (KOI8-R)";
++        name = "Russian Cyrillic (KOI8-R)";
+         break;
+     case QFont::KOI8U:
+-        name = "Ukrainian (KOI8-U)";
++        name = "Ukrainian Cyrillic (KOI8-U)";
+         break;
++    case QFont::CP_1251:
++        name = "Windows Cyrillic (CP 1251)";
++        break;
++    case QFont::PT_154:
++        name = "Asian Cyrillic (PT 154)";
++	break;
+     case QFont::TSCII:
+ 	name = "Tamil (TSCII)";
+ 	break;
+@@ -1571,6 +1595,18 @@
+         sample += QChar(0x0436);
+         sample += QChar(0x2560);
+         break;
++    case QFont::CP_1251:
++ 	sample += QChar(0x0414);
++ 	sample += QChar(0x0490);
++ 	sample += QChar(0x040E);
++ 	sample += QChar(0x20AC);
++  	break;
++    case QFont::PT_154:
++ 	sample += QChar(0x0496);
++ 	sample += QChar(0x04E8);
++ 	sample += QChar(0x04D8);
++ 	sample += QChar(0x04AE);
++  	break;
+     case QFont::Unicode:
+         sample = "Aa";
+         sample += QChar(0x01A7); // Latin B
diff --git a/x11-toolkits/qt32/files/patch-ap b/x11-toolkits/qt32/files/patch-ap
new file mode 100644
index 000000000000..593ac76bdbbf
--- /dev/null
+++ b/x11-toolkits/qt32/files/patch-ap
@@ -0,0 +1,12 @@
+diff -ur src/kernel/qpsprinter.cpp src/kernel/qpsprinter.cpp
+--- src/kernel/qpsprinter.cpp	Wed Oct  4 13:48:49 2000
++++ src/kernel/qpsprinter.cpp	Mon Oct  9 11:53:48 2000
+@@ -1734,2 +1734,4 @@
+     { QFont::KOI8R, 2084 },
++    { QFont::KOI8U, 2088 },
++    { QFont::CP_1251, 2251 },
+     { QFont::ISO_8859_1, 4 },
+@@ -1747,2 +1749,3 @@
+     { QFont::ISO_8859_15, 111 },
++    { QFont::PT_154, 0 },
+     // makeFixedStrings() below assumes that this is last
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index e7fc891de579..6c597d5eccc4 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	qt
 PORTVERSION=	2.2.3
 .if exists(${X11BASE}/lib/libXft.so) && !defined(NO_AA)
-PORTREVISION=	1
+PORTREVISION=	2
 .endif
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
diff --git a/x11-toolkits/qt33/files/patch-al b/x11-toolkits/qt33/files/patch-al
new file mode 100644
index 000000000000..a7a86c62bc89
--- /dev/null
+++ b/x11-toolkits/qt33/files/patch-al
@@ -0,0 +1,31 @@
+diff -ur src/kernel/qfont.cpp src/kernel/qfont.cpp
+--- src/kernel/qfont.cpp	Wed Oct  4 13:48:48 2000
++++ src/kernel/qfont.cpp	Mon Oct  9 11:53:48 2000
+@@ -200,6 +200,8 @@
+    <li> \c QFont::KOI8U - KOI8-U, Cyrillic/Ukrainian, defined in
+        <a href="ftp://ftp.nordu.net/rfc/rfc2319.txt">RFC 2319.</a>
+    <li> \c QFont::AnyCharSet - whatever is handiest.
++  <li> \c QFont::CP_1251, Microsoft Cyrillic encoding
++  <li> \c QFont::PT_154, Paratype Asian Cyrillic encoding
+   <li> \c QFont::Set_Ja, Japanese
+   <li> \c QFont::Set_Ko, Korean
+   <li> \c QFont::Set_Th_TH
+@@ -1016,11 +1018,16 @@
+         result = "iso8859-15";
+         break;
+     case QFont::KOI8R:
+-        result = "KOI8-R";
++        result = "koi8-r";
+         break;
+     case QFont::KOI8U:
+-        result = "KOI8-U";
++        result = "koi8-u";
+         break;
++    case QFont::CP_1251:
++        result = "cp1251";
++        break;
++    case QFont::PT_154:
++        result = "pt154";
+     case QFont::Set_Ja:
+         result = "Set_Ja";
+         break;
diff --git a/x11-toolkits/qt33/files/patch-am b/x11-toolkits/qt33/files/patch-am
new file mode 100644
index 000000000000..bea22e3b5906
--- /dev/null
+++ b/x11-toolkits/qt33/files/patch-am
@@ -0,0 +1,23 @@
+diff -ur src/kernel/qfont.h src/kernel/qfont.h
+--- src/kernel/qfont.h	Wed Oct  4 13:48:48 2000
++++ src/kernel/qfont.h	Mon Oct  9 11:53:48 2000
+@@ -70,6 +70,9 @@
+ 		     ISO_8859_14, Latin8 = ISO_8859_14,
+ 		     ISO_8859_15, Latin9 = ISO_8859_15,
+ 		     KOI8R,
++		     KOI8U,
++		     CP_1251,
++		     PT_154,
+ 		     Set_Ja, Set_1 = Set_Ja,
+ 		     Set_Ko,
+ 		     Set_Th_TH,
+@@ -96,8 +99,7 @@
+ 		     KSC_5601,
+ 		     GB_2312,
+ 		     Big5,
+-		     TSCII,
+-		     KOI8U
++		     TSCII
+     };
+     enum StyleHint { Helvetica, Times, Courier, OldEnglish,  System, AnyStyle,
+ 		     SansSerif	= Helvetica,
diff --git a/x11-toolkits/qt33/files/patch-an b/x11-toolkits/qt33/files/patch-an
new file mode 100644
index 000000000000..74b1d0cfa126
--- /dev/null
+++ b/x11-toolkits/qt33/files/patch-an
@@ -0,0 +1,60 @@
+diff -ur src/kernel/qfont_x11.cpp src/kernel/qfont_x11.cpp
+--- src/kernel/qfont_x11.cpp	Wed Oct  4 13:48:48 2000
++++ src/kernel/qfont_x11.cpp	Mon Oct  9 11:59:36 2000
+@@ -324,6 +324,9 @@
+     { "ISO 8859-14", QFont::ISO_8859_14 },
+     { "ISO 8859-15", QFont::ISO_8859_15 },
+     { "KOI8-R", QFont::KOI8R },
++    { "KOI8-U", QFont::KOI8U },
++    { "CP 1251", QFont::CP_1251 },
++    { "PT 154", QFont::PT_154 },
+     { "eucJP", QFont::Set_Ja },
+     { "SJIS", QFont::Set_Ja },
+     { "JIS7", QFont::Set_Ja },
+@@ -337,7 +340,6 @@
+     { "Big5", QFont::Set_Big5 },
+     { "ta_TA.TSCII", QFont::TSCII },
+     { "TSCII", QFont::TSCII },
+-    { "KOI8-U", QFont::KOI8U },
+     { 0, /* anything */ QFont::ISO_8859_1 }
+ };
+ 
+@@ -513,6 +515,12 @@
+     } else if( strcmp( tokens[CharsetRegistry], "koi8" ) == 0 &&
+ 	       strcmp( tokens[CharsetEncoding], "u" ) == 0) {
+ 	fd->charSet = QFont::KOI8U;
++    } else if( qstrcmp( tokens[CharsetEncoding], "cp1251" ) == 0 ||
++  	       (qstrcmp( tokens[CharsetEncoding], "1251" ) == 0 ) ) {
++  	fd->charSet = QFont::CP_1251;
++    } else if( qstrcmp( tokens[CharsetEncoding], "cp154" ) == 0 ||
++  	       (qstrcmp( tokens[CharsetEncoding], "154" ) == 0 ) ) {
++  	fd->charSet = QFont::PT_154;
+     } else if( qstrcmp( tokens[CharsetRegistry], "tscii" ) == 0 &&
+ 	       qstrcmp( tokens[CharsetEncoding], "0" ) == 0 ) {
+ 	fd->charSet = QFont::TSCII;
+@@ -1424,11 +1432,23 @@
+        else
+ 	       exactMatch = FALSE;
+     } else if ( charSet() == KOI8U ) {
+-       if ( strcmp( tokens[CharsetRegistry], "koi8" ) == 0 &&
+-	    strcmp( tokens[CharsetEncoding], "u" ) == 0 )
++       if ( qstrcmp( tokens[CharsetRegistry], "koi8" ) == 0 &&
++	    qstrcmp( tokens[CharsetEncoding], "u" ) == 0 )
+ 	    score |= CharSetScore;
+ 	else
+ 	    exactMatch = FALSE;
++    } else if ( charSet() == CP_1251 ) {
++        if  (qstrcmp( tokens[CharsetEncoding], "cp1251" ) == 0 ||
++                qstrcmp( tokens[CharsetEncoding], "1251" ) == 0) 
++                  score |= CharSetScore;
++          else
++                  exactMatch = FALSE;
++    } else if ( charSet() == PT_154 ) {
++        if  (qstrcmp( tokens[CharsetEncoding], "cp154" ) == 0 ||
++                qstrcmp( tokens[CharsetEncoding], "154" ) == 0) 
++                  score |= CharSetScore;
++          else
++                  exactMatch = FALSE;
+     } else if ( qstrcmp( tokens[CharsetRegistry], "iso8859" ) == 0 &&
+ 		charSet() >= ISO_8859_1 && charSet() <= ISO_8859_15 ) {
+ 	int i = 0;
diff --git a/x11-toolkits/qt33/files/patch-ao b/x11-toolkits/qt33/files/patch-ao
new file mode 100644
index 000000000000..58e5fd9dff99
--- /dev/null
+++ b/x11-toolkits/qt33/files/patch-ao
@@ -0,0 +1,85 @@
+diff -ur src/kernel/qfontdatabase.cpp src/kernel/qfontdatabase.cpp
+--- src/kernel/qfontdatabase.cpp	Wed Oct  4 13:48:48 2000
++++ src/kernel/qfontdatabase.cpp	Mon Oct  9 12:03:01 2000
+@@ -1280,9 +1280,15 @@
+ 		(qstrcmp( encoding, "r" ) == 0 ||
+ 		 qstrcmp( encoding, "1" ) == 0) ) {
+ 	return QFont::KOI8R;
+-    } else if ( strcmp( registry, "koi8" ) == 0 &&
++    } else if ( qstrcmp( registry, "koi8" ) == 0 &&
+ 		qstrcmp( encoding, "u" ) == 0) {
+ 	return QFont::KOI8U;
++    } else if ( qstrcmp( encoding, "cp1251" ) == 0 ||
++  		 qstrcmp( encoding, "1251" ) == 0)  {
++  	return QFont::CP_1251;
++    } else if ( qstrcmp( encoding, "cp154" ) == 0 ||
++  		 qstrcmp( encoding, "154" ) == 0)  {
++  	return QFont::PT_154;
+     } else if ( qstrcmp( registry, "tscii" ) == 0 &&
+ 		qstrcmp( encoding, "0" ) == 0 ) {
+ 	return QFont::TSCII;
+@@ -1334,6 +1340,14 @@
+         return QFont::KOI8R;
+     if ( name == "koi8-u" )
+         return QFont::KOI8U;
++    if ( name == "microsoft-cp1251" )
++	return QFont::CP_1251;
++    if ( name == "windows-1251" )
++ 	return QFont::CP_1251;
++    if ( name == "paratype-cp154" )
++	return QFont::PT_154;
++    if ( name == "paratype-154" )
++ 	return QFont::PT_154;
+     if ( name == "tis620-0" )
+         return QFont::TIS620;
+     if ( name == "tscii-0" )
+@@ -1380,6 +1394,10 @@
+         return "koi8-r";
+     case QFont::KOI8U:
+         return "koi8-u";
++    case QFont::CP_1251:
++        return "microsoft-cp1251";
++    case QFont::PT_154:
++        return "paratype-cp154";
+     case QFont::Unicode:
+         return "iso10646-1";
+     default:
+@@ -1448,11 +1466,17 @@
+         name = "French/Finnish/Euro(ISO 8859-15)";
+         break;
+     case QFont::KOI8R:
+-        name = "Cyrillic (KOI8-R)";
++        name = "Russian Cyrillic (KOI8-R)";
+         break;
+     case QFont::KOI8U:
+-        name = "Ukrainian (KOI8-U)";
++        name = "Ukrainian Cyrillic (KOI8-U)";
+         break;
++    case QFont::CP_1251:
++        name = "Windows Cyrillic (CP 1251)";
++        break;
++    case QFont::PT_154:
++        name = "Asian Cyrillic (PT 154)";
++	break;
+     case QFont::TSCII:
+ 	name = "Tamil (TSCII)";
+ 	break;
+@@ -1571,6 +1595,18 @@
+         sample += QChar(0x0436);
+         sample += QChar(0x2560);
+         break;
++    case QFont::CP_1251:
++ 	sample += QChar(0x0414);
++ 	sample += QChar(0x0490);
++ 	sample += QChar(0x040E);
++ 	sample += QChar(0x20AC);
++  	break;
++    case QFont::PT_154:
++ 	sample += QChar(0x0496);
++ 	sample += QChar(0x04E8);
++ 	sample += QChar(0x04D8);
++ 	sample += QChar(0x04AE);
++  	break;
+     case QFont::Unicode:
+         sample = "Aa";
+         sample += QChar(0x01A7); // Latin B
diff --git a/x11-toolkits/qt33/files/patch-ap b/x11-toolkits/qt33/files/patch-ap
new file mode 100644
index 000000000000..593ac76bdbbf
--- /dev/null
+++ b/x11-toolkits/qt33/files/patch-ap
@@ -0,0 +1,12 @@
+diff -ur src/kernel/qpsprinter.cpp src/kernel/qpsprinter.cpp
+--- src/kernel/qpsprinter.cpp	Wed Oct  4 13:48:49 2000
++++ src/kernel/qpsprinter.cpp	Mon Oct  9 11:53:48 2000
+@@ -1734,2 +1734,4 @@
+     { QFont::KOI8R, 2084 },
++    { QFont::KOI8U, 2088 },
++    { QFont::CP_1251, 2251 },
+     { QFont::ISO_8859_1, 4 },
+@@ -1747,2 +1749,3 @@
+     { QFont::ISO_8859_15, 111 },
++    { QFont::PT_154, 0 },
+     // makeFixedStrings() below assumes that this is last