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

8 files changed, 128 insertions, 348 deletions

diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile
index d3b51d11abb5..609e773174d6 100644
--- a/x11-toolkits/qt23/Makefile
+++ b/x11-toolkits/qt23/Makefile
@@ -5,19 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	qt
-PORTVERSION=	2.2.3
-PORTREVISION=	3
-CATEGORIES=	x11-toolkits
+PORTNAME?=	qt
+PORTVERSION?=	2.2.4
+CATEGORIES?=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
 DISTNAME=	qt-x11-${PORTVERSION}
 
-.if exists(${X11BASE}/lib/libXft.so) && !defined(NO_AA)
-PATCHFILES=	qt-aa-${PORTVERSION}.diff.gz
-PATCH_SITES=	${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	will
-.endif
-
 MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	mng.0:${PORTSDIR}/graphics/libmng \
@@ -26,26 +19,27 @@ LIB_DEPENDS=	mng.0:${PORTSDIR}/graphics/libmng \
 
 YES?=		/usr/bin/yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+USE_MESA=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-system-zlib -system-libpng -system-jpeg -sm -gif \
-		-system-libmng -thread -no-opengl \
+		-system-libmng -thread \
 		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 CONFIGURE_ENV=	${YES} yes | QTDIR=${WRKSRC}
 .if defined(MAKE_JOBS)
 MAKE_ARGS+=	MAKE="${GMAKE} -j${MAKE_JOBS}"
-.else
-MAKE_ARGS+=	MAKE="${GMAKE} -j2"
 .endif
-MAKE_ENV=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib
+MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib
 
 CONFIG=		${WRKSRC}/configs/freebsd-g++-${STATIC}
 
 .if !defined(NOPORTDOCS)
+.if (${PORTNAME} == "qt")
 .include "${.CURDIR}/files/manpages"
 .endif
+.endif
 
 .if defined(WANT_STATIC)
 STATIC=static
@@ -68,30 +62,25 @@ pre-fetch:
 .endif
 
 pre-configure:
-	@${CP} ${CONFIG} ${CONFIG}.new
-	${SED} -e "s,gcc,${CC},g" -e "s,g\+\+,${CXX},g" -e "s,/usr/X11R6,${X11BASE},g" \
-		-e "s,-pipe -O2,${CXXFLAGS} -frerun-cse-after-loop,g" ${CONFIG}.new > ${CONFIG}
-.if exists(${X11BASE}/lib/libXft.so) && !defined(NO_AA)
-	@${CP} ${CONFIG} ${CONFIG}.new
-	${SED} -e "s,= -lXext,= -lXft -lXext,g" -e "s,QT= -I,QT= -DQT_XFT -I,g" \
-		${CONFIG}.new > ${CONFIG}
-.endif
-	${CP} ${WRKSRC}/src/Makefile.in ${WRKSRC}/src/Makefile.in.new
-	${SED} -e "s,VER_MAJ = 2,VER_MAJ = 4,g" -e "s,TARGET	= qt,TARGET = qt2,g" ${WRKSRC}/src/Makefile.in.new > ${WRKSRC}/src/Makefile.in
+	${PERL} -pi -e "s,gcc,${CC},g; s,g\+\+,${CXX},g; \
+			s,/usr/X11R6,${X11BASE},g; \
+			s,-pipe -O2,${CXXFLAGS} -frerun-cse-after-loop,g" ${CONFIG}
+	${PERL} -pi -e "s,VER_MAJ = 2,VER_MAJ = 4,g; \
+			s,TARGET	= qt,TARGET = qt2,g" ${WRKSRC}/src/Makefile.in
 	${PERL} -pi -e "s@TARGET\t= moc@TARGET = moc2@g" ${WRKSRC}/src/moc/Makefile.in
-	${CP} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.new
-	${SED} -e "s,rm -f bin/moc,rm -f  bin/moc2,g" -e "s,cp src/moc/moc bin/moc,cp src/moc/moc2 bin/moc2,g" \
-		-e "s,symlinks  src-moc src-mt sub-src sub-tools sub-tutorial sub-examples,symlinks src-moc src-mt sub-src sub-tools,g" \
-		${WRKSRC}/Makefile.new > ${WRKSRC}/Makefile
-	${PERL} -pi -e "s@-L../lib@-L${WRKSRC}/lib@g" ${WRKSRC}/tools/designer/uic/Makefile.in
+	${PERL} -pi -e "s,rm -f bin/moc,rm -f  bin/moc2,g; \
+			s,cp src/moc/moc bin/moc,cp src/moc/moc2 bin/moc2,g; \
+			s,symlinks  src-moc src-mt sub-src sub-tools sub-tutorial sub-examples,symlinks src-moc src-mt sub-src sub-tools,g" \
+		${WRKSRC}/Makefile
 
 post-configure:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} symlinks)
 
+# XXX: This target looks like crap now.
 do-install:
+.if (${PORTNAME} == "qt")
 	${MKDIR} ${PREFIX}/include/qt2
-	${MKDIR} ${PREFIX}/share/qt2/designer/templates
-.for BIN in designer moc2 uic
+.for BIN in moc2 uic
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${BIN} ${PREFIX}/bin
 .endfor
 .for SCRIPT in findtr qt20fix qtrename140
@@ -99,38 +88,41 @@ do-install:
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qt2
 .if !defined(WANT_STATIC)
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/libqt2.so.4 ${PREFIX}/lib
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/libqt2-mt.so.4 ${PREFIX}/lib
+.for LIB in qt2 qt2-mt
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/lib${LIB}.so.4 ${PREFIX}/lib
+	${LN} -sf ${PREFIX}/lib/lib${LIB}.so.4 ${PREFIX}/lib/lib${LIB}.so
+.endfor
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/libqutil.so.1 ${PREFIX}/lib
-	${LN} -sf ${PREFIX}/lib/libqt2-mt.so.4 ${PREFIX}/lib//libqt2-mt.so
-	${LN} -sf ${PREFIX}/lib/libqt2.so.4 ${PREFIX}/lib/libqt2.so
 	${LN} -sf ${PREFIX}/lib/libqutil.so.1 ${PREFIX}/lib/libqutil.so
 .else
 .for LIB in qt2 qutil
 	${INSTALL_DATA} ${WRKSRC}/lib/lib${LIB}.a ${PREFIX}/lib
 .endfor
 .endif
-	${INSTALL_DATA} ${WRKSRC}/tools/designer/templates/* \
-		${PREFIX}/share/qt2/designer/templates
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/qt2
-	(cd ${WRKSRC} ; \
-	${INSTALL_DATA} ANNOUNCE ${PREFIX}/share/doc/qt2 ; \
-	${INSTALL_DATA} FAQ ${PREFIX}/share/doc/qt2 ; \
-	${INSTALL_DATA} LICENSE.QPL ${PREFIX}/share/doc/qt2 ; \
-	${INSTALL_DATA} PORTING ${PREFIX}/share/doc/qt2 ; \
-	${INSTALL_DATA} README ${PREFIX}/share/doc/qt2 ; \
-	${INSTALL_DATA} README.QT ${PREFIX}/share/doc/qt2 ; \
-	( cd ${WRKSRC}/doc &&  ${TAR} -chf - html | \
-		${TAR} --unlink -xf - -C ${PREFIX}/share/doc/qt2 ) ; \
-	${INSTALL_MAN} doc/man/man3/q* ${PREFIX}/man/man3 )
+	${MKDIR} ${PREFIX}/share/doc/qt2/html
+.for FILE in ANNOUNCE FAQ PORTING README README.QT
+	${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/share/doc/qt2
+.endfor
+.for SUFFIX in g1n html png
+	(for FILE in ${WRKSRC}/doc/html/*.${SUFFIX}; do \
+		${INSTALL_DATA} $$FILE ${PREFIX}/share/doc/qt2/html; done)
+.endfor
+.for FILE in index titleindex propertyindex whatsthis
+	${INSTALL_DATA} ${WRKSRC}/doc/html/${FILE} ${PREFIX}/share/doc/qt2/html
+.endfor
+	${INSTALL_MAN} ${WRKSRC}/doc/man/man3/q* ${PREFIX}/man/man3
+.endif
 .endif
 
 .if defined(WANT_STATIC)
+.if (${PORTNAME} == "qt")
 post-install:
 	${CP} ${TMPPLIST} ${TMPPLIST}.new
-	${SED} -e "s/libqt2\/.so/libqt2\.a/" -e "s/.*libqt2\.a\.\d\n//" -e "s/libqutil\.so/libqutil.a/" \
-		-e "s/.*libqutil\.a\.\d\n//" ${TMPPLIST}.new > ${TMPPLIST}
+	${SED} -e "s/libqt2\/.so/libqt2\.a/" -e "s/.*libqt2\.a\.\d\n//" \
+		-e "s/libqutil\.so/libqutil.a/" -e "s/.*libqutil\.a\.\d\n//" \
+			${TMPPLIST}.new > ${TMPPLIST}
+.endif
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/qt23/distinfo b/x11-toolkits/qt23/distinfo
index 2d9f30cfc960..88b10c614ba0 100644
--- a/x11-toolkits/qt23/distinfo
+++ b/x11-toolkits/qt23/distinfo
@@ -1,2 +1 @@
-MD5 (qt-x11-2.2.3.tar.gz) = 964ca0e7e641271a2f5706a0e4383fcf
-MD5 (qt-aa-2.2.3.diff.gz) = 027a296235e541d78d72ff99b4a86515
+MD5 (qt-x11-2.2.4.tar.gz) = 0a5cb173ded05c6b6ea620396d16889d
diff --git a/x11-toolkits/qt23/files/patch-al b/x11-toolkits/qt23/files/patch-al
index a7a86c62bc89..3be06c07aa42 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 bea22e3b5906..0df46e135e46 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 74b1d0cfa126..b3a5f30703bb 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 58e5fd9dff99..f26c1d1e80dc 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 000000000000..f13ffe614aa8
--- /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
diff --git a/x11-toolkits/qt23/pkg-plist b/x11-toolkits/qt23/pkg-plist
index 4089bfe38f70..9543422204e0 100644
--- a/x11-toolkits/qt23/pkg-plist
+++ b/x11-toolkits/qt23/pkg-plist
@@ -1,4 +1,3 @@
-bin/designer
 bin/findtr
 bin/moc2
 bin/qt20fix
@@ -284,21 +283,21 @@ include/qt2/qwmatrix.h
 include/qt2/qworkspace.h
 include/qt2/qxml.h
 include/qt2/qxt.h
-lib/libqt2.so
-lib/libqt2.so.4
 lib/libqt2-mt.so
 lib/libqt2-mt.so.4
+lib/libqt2.so
+lib/libqt2.so.4
 lib/libqutil.so
 lib/libqutil.so.1
 share/doc/qt2/ANNOUNCE
 share/doc/qt2/FAQ
-share/doc/qt2/LICENSE.QPL
 share/doc/qt2/PORTING
 share/doc/qt2/README
 share/doc/qt2/README.QT
 share/doc/qt2/html/HOWTO-framebuffer.html
 share/doc/qt2/html/aboutqt.html
 share/doc/qt2/html/abstractwidgets.html
+share/doc/qt2/html/accel.html
 share/doc/qt2/html/accelerators.html
 share/doc/qt2/html/aclock-main-cpp.html
 share/doc/qt2/html/action-main-cpp.html
@@ -340,159 +339,6 @@ share/doc/qt2/html/debug.html
 share/doc/qt2/html/design.html
 share/doc/qt2/html/designer.html
 share/doc/qt2/html/designer.png
-share/doc/qt2/html/designer/arrows/home.png
-share/doc/qt2/html/designer/arrows/left.png
-share/doc/qt2/html/designer/arrows/right.png
-share/doc/qt2/html/designer/arrows/up.png
-share/doc/qt2/html/designer/book1.html
-share/doc/qt2/html/designer/chap10_1.html
-share/doc/qt2/html/designer/chap1_1.html
-share/doc/qt2/html/designer/chap2_1.html
-share/doc/qt2/html/designer/chap2_2.html
-share/doc/qt2/html/designer/chap2_3.html
-share/doc/qt2/html/designer/chap2_4.html
-share/doc/qt2/html/designer/chap3_1.html
-share/doc/qt2/html/designer/chap3_2.html
-share/doc/qt2/html/designer/chap3_3.html
-share/doc/qt2/html/designer/chap3_4.html
-share/doc/qt2/html/designer/chap4_1.html
-share/doc/qt2/html/designer/chap4_2.html
-share/doc/qt2/html/designer/chap5_1.html
-share/doc/qt2/html/designer/chap5_2.html
-share/doc/qt2/html/designer/chap5_3.html
-share/doc/qt2/html/designer/chap5_4.html
-share/doc/qt2/html/designer/chap5_5.html
-share/doc/qt2/html/designer/chap5_6.html
-share/doc/qt2/html/designer/chap6_1.html
-share/doc/qt2/html/designer/chap6_2.html
-share/doc/qt2/html/designer/chap6_3.html
-share/doc/qt2/html/designer/chap6_4.html
-share/doc/qt2/html/designer/chap6_5.html
-share/doc/qt2/html/designer/chap6_6.html
-share/doc/qt2/html/designer/chap6_7.html
-share/doc/qt2/html/designer/chap7_1.html
-share/doc/qt2/html/designer/chap7_10.html
-share/doc/qt2/html/designer/chap7_11.html
-share/doc/qt2/html/designer/chap7_12.html
-share/doc/qt2/html/designer/chap7_13.html
-share/doc/qt2/html/designer/chap7_14.html
-share/doc/qt2/html/designer/chap7_15.html
-share/doc/qt2/html/designer/chap7_16.html
-share/doc/qt2/html/designer/chap7_2.html
-share/doc/qt2/html/designer/chap7_3.html
-share/doc/qt2/html/designer/chap7_4.html
-share/doc/qt2/html/designer/chap7_5.html
-share/doc/qt2/html/designer/chap7_6.html
-share/doc/qt2/html/designer/chap7_7.html
-share/doc/qt2/html/designer/chap7_8.html
-share/doc/qt2/html/designer/chap7_9.html
-share/doc/qt2/html/designer/chap8_1.html
-share/doc/qt2/html/designer/chap9_1.html
-share/doc/qt2/html/designer/chap9_2.html
-share/doc/qt2/html/designer/chap9_3.html
-share/doc/qt2/html/designer/chap9_4.html
-share/doc/qt2/html/designer/chap9_5.html
-share/doc/qt2/html/designer/chap9_6.html
-share/doc/qt2/html/designer/colophon.html
-share/doc/qt2/html/designer/feedback.html
-share/doc/qt2/html/designer/figures/aboutdialog.png
-share/doc/qt2/html/designer/figures/adjustsize.png
-share/doc/qt2/html/designer/figures/breaklayout.png
-share/doc/qt2/html/designer/figures/buttongroup.png
-share/doc/qt2/html/designer/figures/buttongroupovercheckboxes.png
-share/doc/qt2/html/designer/figures/checkbox.png
-share/doc/qt2/html/designer/figures/combobox.png
-share/doc/qt2/html/designer/figures/connectionedit.png
-share/doc/qt2/html/designer/figures/connections.png
-share/doc/qt2/html/designer/figures/connectionviewer.png
-share/doc/qt2/html/designer/figures/connecttool.png
-share/doc/qt2/html/designer/figures/customwidget.png
-share/doc/qt2/html/designer/figures/customwidgets.png
-share/doc/qt2/html/designer/figures/editcopy.png
-share/doc/qt2/html/designer/figures/editcustomwidgets.png
-share/doc/qt2/html/designer/figures/editcut.png
-share/doc/qt2/html/designer/figures/editdelete.png
-share/doc/qt2/html/designer/figures/editgrid.png
-share/doc/qt2/html/designer/figures/edithlayout.png
-share/doc/qt2/html/designer/figures/editiconview.png
-share/doc/qt2/html/designer/figures/editlistbox.png
-share/doc/qt2/html/designer/figures/editlistview.png
-share/doc/qt2/html/designer/figures/editlower.png
-share/doc/qt2/html/designer/figures/editmultiline.png
-share/doc/qt2/html/designer/figures/editpaste.png
-share/doc/qt2/html/designer/figures/editraise.png
-share/doc/qt2/html/designer/figures/editslots.png
-share/doc/qt2/html/designer/figures/emptydialog.png
-share/doc/qt2/html/designer/figures/f001.png
-share/doc/qt2/html/designer/figures/filenew.png
-share/doc/qt2/html/designer/figures/filesave.png
-share/doc/qt2/html/designer/figures/firstdialog.png
-share/doc/qt2/html/designer/figures/form.png
-share/doc/qt2/html/designer/figures/formsettings.png
-share/doc/qt2/html/designer/figures/fourcheckboxes.png
-share/doc/qt2/html/designer/figures/frame.png
-share/doc/qt2/html/designer/figures/groupbox.png
-share/doc/qt2/html/designer/figures/help.png
-share/doc/qt2/html/designer/figures/helpdialog.png
-share/doc/qt2/html/designer/figures/home.png
-share/doc/qt2/html/designer/figures/iconview.png
-share/doc/qt2/html/designer/figures/image.png
-share/doc/qt2/html/designer/figures/label.png
-share/doc/qt2/html/designer/figures/layout.png
-share/doc/qt2/html/designer/figures/layouttutstep1.png
-share/doc/qt2/html/designer/figures/layouttutstep10.png
-share/doc/qt2/html/designer/figures/layouttutstep11.png
-share/doc/qt2/html/designer/figures/layouttutstep2.png
-share/doc/qt2/html/designer/figures/layouttutstep3.png
-share/doc/qt2/html/designer/figures/layouttutstep4.png
-share/doc/qt2/html/designer/figures/layouttutstep5.png
-share/doc/qt2/html/designer/figures/layouttutstep6.png
-share/doc/qt2/html/designer/figures/layouttutstep7.png
-share/doc/qt2/html/designer/figures/layouttutstep9.png
-share/doc/qt2/html/designer/figures/lcdnumber.png
-share/doc/qt2/html/designer/figures/left.png
-share/doc/qt2/html/designer/figures/line.png
-share/doc/qt2/html/designer/figures/lineedit.png
-share/doc/qt2/html/designer/figures/listbox.png
-share/doc/qt2/html/designer/figures/listview.png
-share/doc/qt2/html/designer/figures/load.png
-share/doc/qt2/html/designer/figures/multilineedit.png
-share/doc/qt2/html/designer/figures/newform.png
-share/doc/qt2/html/designer/figures/newformdialog.png
-share/doc/qt2/html/designer/figures/objecthierarchy.png
-share/doc/qt2/html/designer/figures/onecheckbox.png
-share/doc/qt2/html/designer/figures/ordertool.png
-share/doc/qt2/html/designer/figures/paletteeditor.png
-share/doc/qt2/html/designer/figures/pixlabel.png
-share/doc/qt2/html/designer/figures/pizza1screenshot.png
-share/doc/qt2/html/designer/figures/pointer.png
-share/doc/qt2/html/designer/figures/preferences.png
-share/doc/qt2/html/designer/figures/print.png
-share/doc/qt2/html/designer/figures/progress.png
-share/doc/qt2/html/designer/figures/pushbutton.png
-share/doc/qt2/html/designer/figures/qtlogo.png
-share/doc/qt2/html/designer/figures/radiobutton.png
-share/doc/qt2/html/designer/figures/redo.png
-share/doc/qt2/html/designer/figures/right.png
-share/doc/qt2/html/designer/figures/slider.png
-share/doc/qt2/html/designer/figures/slots.png
-share/doc/qt2/html/designer/figures/spacer.png
-share/doc/qt2/html/designer/figures/spinbox.png
-share/doc/qt2/html/designer/figures/startup.png
-share/doc/qt2/html/designer/figures/taborderform.png
-share/doc/qt2/html/designer/figures/tabwidget.png
-share/doc/qt2/html/designer/figures/testmode.png
-share/doc/qt2/html/designer/figures/textbrowser.png
-share/doc/qt2/html/designer/figures/textview.png
-share/doc/qt2/html/designer/figures/title.png
-share/doc/qt2/html/designer/figures/toolbutton.png
-share/doc/qt2/html/designer/figures/topicchooser.png
-share/doc/qt2/html/designer/figures/undo.png
-share/doc/qt2/html/designer/figures/vlayout.png
-share/doc/qt2/html/designer/figures/whatsthis.png
-share/doc/qt2/html/designer/part1index.html
-share/doc/qt2/html/designer/part2index.html
-share/doc/qt2/html/designer/preface.html
 share/doc/qt2/html/desktop-desktop-cpp.html
 share/doc/qt2/html/dialogs.html
 share/doc/qt2/html/dirview-main-cpp.html
@@ -504,13 +350,16 @@ share/doc/qt2/html/drawing.html
 share/doc/qt2/html/drawlines-connect-cpp.html
 share/doc/qt2/html/easteregg.html
 share/doc/qt2/html/easteregg2.html
+share/doc/qt2/html/embedclasses.html
 share/doc/qt2/html/environment.html
+share/doc/qt2/html/envvars.html
 share/doc/qt2/html/eventsandfilters.html
 share/doc/qt2/html/examples.html
 share/doc/qt2/html/face.png
 share/doc/qt2/html/features.html
 share/doc/qt2/html/fileiconview-main-cpp.html
 share/doc/qt2/html/focus.html
+share/doc/qt2/html/fontdir.html
 share/doc/qt2/html/fonts-qws.html
 share/doc/qt2/html/forever-forever-cpp.html
 share/doc/qt2/html/frames.png
@@ -872,6 +721,8 @@ share/doc/qt2/html/qfontdlg-w.png
 share/doc/qt2/html/qfontinfo-h.html
 share/doc/qt2/html/qfontinfo-members.html
 share/doc/qt2/html/qfontinfo.html
+share/doc/qt2/html/qfontmanager-members.html
+share/doc/qt2/html/qfontmanager_qws-h.html
 share/doc/qt2/html/qfontmetrics-h.html
 share/doc/qt2/html/qfontmetrics-members.html
 share/doc/qt2/html/qfontmetrics.html
@@ -897,6 +748,9 @@ share/doc/qt2/html/qgdict-members.html
 share/doc/qt2/html/qgdict.html
 share/doc/qt2/html/qgdictiterator-members.html
 share/doc/qt2/html/qgdictiterator.html
+share/doc/qt2/html/qgfx_qws-h.html
+share/doc/qt2/html/qgfxraster_qws-h.html
+share/doc/qt2/html/qgfxrasterbase-members.html
 share/doc/qt2/html/qgl-h.html
 share/doc/qt2/html/qgl-members.html
 share/doc/qt2/html/qgl.html
@@ -1066,6 +920,8 @@ share/doc/qt2/html/qlnode.html
 share/doc/qt2/html/qlocalfs-h.html
 share/doc/qt2/html/qlocalfs-members.html
 share/doc/qt2/html/qlocalfs.html
+share/doc/qt2/html/qlock-members.html
+share/doc/qt2/html/qlock_qws-h.html
 share/doc/qt2/html/qmag-qmag-cpp.html
 share/doc/qt2/html/qmainwindow-h.html
 share/doc/qt2/html/qmainwindow-m.png
@@ -1235,10 +1091,14 @@ share/doc/qt2/html/qregexp.html
 share/doc/qt2/html/qregion-h.html
 share/doc/qt2/html/qregion-members.html
 share/doc/qt2/html/qregion.html
+share/doc/qt2/html/qrenderedfont-members.html
 share/doc/qt2/html/qresizeevent-members.html
 share/doc/qt2/html/qresizeevent.html
 share/doc/qt2/html/qscrbar-m.png
 share/doc/qt2/html/qscrbar-w.png
+share/doc/qt2/html/qscreen-members.html
+share/doc/qt2/html/qscreencursor-members.html
+share/doc/qt2/html/qscreencursor.html
 share/doc/qt2/html/qscrollbar-h.html
 share/doc/qt2/html/qscrollbar-members.html
 share/doc/qt2/html/qscrollbar.html
@@ -1677,26 +1537,21 @@ share/doc/qt2/html/tutorial.png
 share/doc/qt2/html/unicode.html
 share/doc/qt2/html/unsmooth.png
 share/doc/qt2/html/validator-main-cpp.html
+share/doc/qt2/html/walkthroughs.html
 share/doc/qt2/html/whatsthis
 share/doc/qt2/html/whatsthis.png
 share/doc/qt2/html/winsystem.html
 share/doc/qt2/html/wizard-main-cpp.html
 share/doc/qt2/html/workspace.html
 share/doc/qt2/html/xform-xform-cpp.html
+share/doc/qt2/html/xml-dom.html
+share/doc/qt2/html/xml-sax-walkthrough.html
 share/doc/qt2/html/xml-sax.html
+share/doc/qt2/html/xml-tagreader-tagreader-cpp.html
+share/doc/qt2/html/xml-tagreader-with-features-tagreader-cpp.html
 share/doc/qt2/html/xml.html
 share/doc/qt2/html/xt.html
 share/doc/qt2/html/y2k.html
-share/qt2/designer/templates/Configuration_Dialog.ui
-share/qt2/designer/templates/Dialog_with_Buttons_(Bottom).ui
-share/qt2/designer/templates/Dialog_with_Buttons_(Right).ui
-share/qt2/designer/templates/Tab-Dialog.ui
-@dirrm share/qt2/designer/templates
-@dirrm share/qt2/designer
-@dirrm share/qt2
-@dirrm share/doc/qt2/html/designer/figures
-@dirrm share/doc/qt2/html/designer/arrows
-@dirrm share/doc/qt2/html/designer
-@dirrm share/doc/qt2/html
-@dirrm share/doc/qt2
+@unexec /sbin/rm -rf %D/share/doc/qt2/html 2>/dev/null || true
+@unexec /sbin/rm -rf %D/share/doc/qt2 2>/dev/null || true
 @dirrm include/qt2