Bring in my fixes for KDE2 for users of XFree86 4.0.x. Basically, what

this involves is this:  Cull GL from Qt by default, but still provide a
Qt+GL library that may or may not have threads.  Then also provide a Qt
library that has threads but not GL.  This allows us to make KDE2 depend
on a library that will *not* have threads, ever.  Threads will be
revisited at a later date.  Ports that require GL support need to be
updated to use the hacked library, libqtgl.so.4.  The net result is that
we bloat our qt2 package by 1.5-2.5MB for compatability.  Also, static
qt will not have GL support.

Introduce bsd.kde.mk, which will be tested on bento before becoming
fully activated.

Replace qt22-static with qt2-static, since it's just a proxy.  Update
qt-designer to depend on qt23.  Also make the old hack to package the
correct lib obsolete by using PLIST_SUB instead.

Miscellaneous changes:  remove LIBQTFILE from CONFIGURE_ENV, it's not
used anymore.  Solve namespace pollution problems with the devel/pth and
devel/libgnugetopt ports.  Hopefully.

Suggested by:	ade, asami, sobomax (bsd.kde.mk)
Repocopied by:	asami (qt22-static --> qt2-static)

1 files changed, 0 insertions, 33 deletions

diff --git a/x11-toolkits/qt22/files/patch-ao b/x11-toolkits/qt22/files/patch-ao
deleted file mode 100644
index f26c1d1e80dc..000000000000
--- a/x11-toolkits/qt22/files/patch-ao
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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;
-+    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" )
-@@ -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;
--    case QFont::PT154:
-+    case QFont::PT_154:
-  	sample += QChar(0x0496);
-  	sample += QChar(0x04E8);
-  	sample += QChar(0x04D8);