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, 20 deletions

diff --git a/x11-toolkits/qt22/files/patch-am b/x11-toolkits/qt22/files/patch-am
deleted file mode 100644
index 0df46e135e46..000000000000
--- a/x11-toolkits/qt22/files/patch-am
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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,
- 		     KOI8R,
-+		     KOI8U,
-+		     CP_1251,
-+		     PT_154,
- 		     Set_Ja, Set_1 = Set_Ja,
- 		     Set_Ko,
- 		     Set_Th_TH,
-@@ -87,7 +90,6 @@
- 		     Set_Big5,
- 
- 		     TSCII,
--		     KOI8U,
- 		     CP1251,
- 		     PT154,
- 		     /* The following are font-specific encodings that