Update QT2 to 2.2.4: Re-add USE_MESA, remove antialiasing patch, remove

default -j2 (but keep MAKE_JOBS var), restore old perl REs as soon as I'd
learned how to do multiple ones, remove QPL license file from packaging,
sync with newest KOI8-U/R stuff (not tested).  The biggest bonus:  split
QT Designer into its own port, and make the qt22/qt-designer pair a member
of the master-slave ports legion, hopefully to reduce redundancy as much
as possible.  This should also save roughly 20 minutes of compile time on
a dual PIII-600 for those that don't need or want QT Designer.  UIC is,
however, still installed/compiled by the default Qt 2.2.4 (as it _is_
required for other things e.g. KDE2).

USE_MESA may break KDE2.  Hopefully, now that the port does install both
the threaded and non-threaded versions of QT, it won't.  But until the
next release of KDE2, I'm not gonna bother testing to see.

USE_MESA repeatedly requested by:	sobomax

5 files changed, 61 insertions, 127 deletions

diff --git a/x11-toolkits/qt23/files/patch-al b/x11-toolkits/qt23/files/patch-al
index a7a86c6..3be06c0 100644
--- a/x11-toolkits/qt23/files/patch-al
+++ b/x11-toolkits/qt23/files/patch-al
@@ -1,31 +1,24 @@
-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>
+--- src/kernel/qfont.cpp	Wed Jan 31 21:26:40 2001
++++ src/kernel/qfont.cpp.new	Sat Feb  3 16:15:05 2001
+@@ -202,6 +202,8 @@
+   <li> \c QFont::CP1251, Microsoft Cyrillic encoding
+   <li> \c QFont::PT154, Paratype Asian Cyrillic encoding
     <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;
+@@ -1023,6 +1025,12 @@
      case QFont::KOI8U:
--        result = "KOI8-U";
-+        result = "koi8-u";
+         result = "koi8-u";
          break;
 +    case QFont::CP_1251:
-+        result = "cp1251";
-+        break;
++	result = "cp1251";
++	break;
 +    case QFont::PT_154:
-+        result = "pt154";
++	result = "pt154";
++	break;
      case QFont::Set_Ja:
          result = "Set_Ja";
          break;
diff --git a/x11-toolkits/qt23/files/patch-am b/x11-toolkits/qt23/files/patch-am
index bea22e3..0df46e1 100644
--- a/x11-toolkits/qt23/files/patch-am
+++ b/x11-toolkits/qt23/files/patch-am
@@ -1,6 +1,5 @@
-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
+--- src/kernel/qfont.h	Wed Jan 31 21:26:40 2001
++++ src/kernel/qfont.h.new	Sat Feb  3 16:06:47 2001
 @@ -70,6 +70,9 @@
  		     ISO_8859_14, Latin8 = ISO_8859_14,
  		     ISO_8859_15, Latin9 = ISO_8859_15,
@@ -11,13 +10,11 @@ diff -ur src/kernel/qfont.h src/kernel/qfont.h
  		     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,
+@@ -87,7 +90,6 @@
+ 		     Set_Big5,
+ 
+ 		     TSCII,
+-		     KOI8U,
+ 		     CP1251,
+ 		     PT154,
+ 		     /* The following are font-specific encodings that
diff --git a/x11-toolkits/qt23/files/patch-an b/x11-toolkits/qt23/files/patch-an
index 74b1d0c..b3a5f30 100644
--- a/x11-toolkits/qt23/files/patch-an
+++ b/x11-toolkits/qt23/files/patch-an
@@ -1,6 +1,5 @@
-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
+--- src/kernel/qfont_x11.cpp	Wed Jan 31 21:26:40 2001
++++ src/kernel/qfont_x11.cpp.new	Sat Feb  3 16:22:47 2001
 @@ -324,6 +324,9 @@
      { "ISO 8859-14", QFont::ISO_8859_14 },
      { "ISO 8859-15", QFont::ISO_8859_15 },
@@ -11,15 +10,7 @@ diff -ur src/kernel/qfont_x11.cpp src/kernel/qfont_x11.cpp
      { "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 @@
+@@ -522,6 +525,12 @@
      } else if( strcmp( tokens[CharsetRegistry], "koi8" ) == 0 &&
  	       strcmp( tokens[CharsetEncoding], "u" ) == 0) {
  	fd->charSet = QFont::KOI8U;
@@ -32,29 +23,22 @@ diff -ur src/kernel/qfont_x11.cpp src/kernel/qfont_x11.cpp
      } 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 )
+@@ -1435,6 +1444,18 @@
  	    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;
++	    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;
++	    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
index 58e5fd9..f26c1d1 100644
--- a/x11-toolkits/qt23/files/patch-ao
+++ b/x11-toolkits/qt23/files/patch-ao
@@ -1,24 +1,6 @@
-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 @@
+--- src/kernel/qfontdatabase.cpp	Wed Jan 31 21:26:40 2001
++++ src/kernel/qfontdatabase.cpp.new	Sat Feb  3 16:30:20 2001
+@@ -1343,6 +1343,14 @@
          return QFont::KOI8R;
      if ( name == "koi8-u" )
          return QFont::KOI8U;
@@ -33,53 +15,19 @@ diff -ur src/kernel/qfontdatabase.cpp src/kernel/qfontdatabase.cpp
      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 @@
+@@ -1598,13 +1606,13 @@
          sample += QChar(0x0436);
          sample += QChar(0x2560);
          break;
+-    case QFont::CP1251:
 +    case QFont::CP_1251:
-+ 	sample += QChar(0x0414);
-+ 	sample += QChar(0x0490);
-+ 	sample += QChar(0x040E);
-+ 	sample += QChar(0x20AC);
-+  	break;
+  	sample += QChar(0x0414);
+  	sample += QChar(0x0490);
+  	sample += QChar(0x040E);
+  	sample += QChar(0x20AC);
+   	break;
+-    case QFont::PT154:
 +    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
+  	sample += QChar(0x0496);
+  	sample += QChar(0x04E8);
+  	sample += QChar(0x04D8);
diff --git a/x11-toolkits/qt23/files/patch-designer::Makefile.in b/x11-toolkits/qt23/files/patch-designer::Makefile.in
new file mode 100644
index 0000000..f13ffe6
--- /dev/null
+++ b/x11-toolkits/qt23/files/patch-designer::Makefile.in
@@ -0,0 +1,12 @@
+--- tools/designer/Makefile.in	Wed Jan 31 21:29:47 2001
++++ tools/designer/Makefile.in.new	Sat Feb  3 18:05:34 2001
+@@ -6,8 +6,7 @@
+ #############################################################################
+ 
+ SUBDIRS =	util \
+-		uic \
+-		designer
++		uic
+ 
+ all:
+ 	$(MAKE) util