Install threaded qt2 library. Nuke GL dependency (should have listened

to garbanzo long ago), to reduce complications involved when building on
X4.0.2 with thread support.  We don't need GL anyway.  Bump PORTREVISION
(unconditionally this time) to 3.

Submitted by:	Jeremy Shaffner <jeremy@external.org>

12 files changed, 36 insertions, 30 deletions

diff --git a/x11-toolkits/qt22/Makefile b/x11-toolkits/qt22/Makefile
index 6c597d5eccc4..ea89d309c284 100644
--- a/x11-toolkits/qt22/Makefile
+++ b/x11-toolkits/qt22/Makefile
@@ -7,9 +7,7 @@
 
 PORTNAME=	qt
 PORTVERSION=	2.2.3
-.if exists(${X11BASE}/lib/libXft.so) && !defined(NO_AA)
-PORTREVISION=	2
-.endif
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
 DISTNAME=	qt-x11-${PORTVERSION}
@@ -28,13 +26,12 @@ 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 \
+		-system-libmng -thread -no-opengl \
 		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 CONFIGURE_ENV=	${YES} yes | QTDIR=${WRKSRC}
 MAKE_ARGS+=	MAKE="${GMAKE} -j2"
@@ -98,7 +95,9 @@ do-install:
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qt2
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/libqt2.so.4 ${PREFIX}/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/libqt2-mt.so.4 ${PREFIX}/lib
 	${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
 .if defined(WANT_STATIC)
diff --git a/x11-toolkits/qt22/pkg-plist b/x11-toolkits/qt22/pkg-plist
index 5b26f2baddfe..4089bfe38f70 100644
--- a/x11-toolkits/qt22/pkg-plist
+++ b/x11-toolkits/qt22/pkg-plist
@@ -286,6 +286,8 @@ 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/libqutil.so
 lib/libqutil.so.1
 share/doc/qt2/ANNOUNCE
diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile
index 6c597d5eccc4..ea89d309c284 100644
--- a/x11-toolkits/qt23/Makefile
+++ b/x11-toolkits/qt23/Makefile
@@ -7,9 +7,7 @@
 
 PORTNAME=	qt
 PORTVERSION=	2.2.3
-.if exists(${X11BASE}/lib/libXft.so) && !defined(NO_AA)
-PORTREVISION=	2
-.endif
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
 DISTNAME=	qt-x11-${PORTVERSION}
@@ -28,13 +26,12 @@ 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 \
+		-system-libmng -thread -no-opengl \
 		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 CONFIGURE_ENV=	${YES} yes | QTDIR=${WRKSRC}
 MAKE_ARGS+=	MAKE="${GMAKE} -j2"
@@ -98,7 +95,9 @@ do-install:
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qt2
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/libqt2.so.4 ${PREFIX}/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/libqt2-mt.so.4 ${PREFIX}/lib
 	${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
 .if defined(WANT_STATIC)
diff --git a/x11-toolkits/qt23/pkg-plist b/x11-toolkits/qt23/pkg-plist
index 5b26f2baddfe..4089bfe38f70 100644
--- a/x11-toolkits/qt23/pkg-plist
+++ b/x11-toolkits/qt23/pkg-plist
@@ -286,6 +286,8 @@ 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/libqutil.so
 lib/libqutil.so.1
 share/doc/qt2/ANNOUNCE
diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile
index 6c597d5eccc4..ea89d309c284 100644
--- a/x11-toolkits/qt30/Makefile
+++ b/x11-toolkits/qt30/Makefile
@@ -7,9 +7,7 @@
 
 PORTNAME=	qt
 PORTVERSION=	2.2.3
-.if exists(${X11BASE}/lib/libXft.so) && !defined(NO_AA)
-PORTREVISION=	2
-.endif
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
 DISTNAME=	qt-x11-${PORTVERSION}
@@ -28,13 +26,12 @@ 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 \
+		-system-libmng -thread -no-opengl \
 		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 CONFIGURE_ENV=	${YES} yes | QTDIR=${WRKSRC}
 MAKE_ARGS+=	MAKE="${GMAKE} -j2"
@@ -98,7 +95,9 @@ do-install:
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qt2
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/libqt2.so.4 ${PREFIX}/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/libqt2-mt.so.4 ${PREFIX}/lib
 	${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
 .if defined(WANT_STATIC)
diff --git a/x11-toolkits/qt30/pkg-plist b/x11-toolkits/qt30/pkg-plist
index 5b26f2baddfe..4089bfe38f70 100644
--- a/x11-toolkits/qt30/pkg-plist
+++ b/x11-toolkits/qt30/pkg-plist
@@ -286,6 +286,8 @@ 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/libqutil.so
 lib/libqutil.so.1
 share/doc/qt2/ANNOUNCE
diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index 6c597d5eccc4..ea89d309c284 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -7,9 +7,7 @@
 
 PORTNAME=	qt
 PORTVERSION=	2.2.3
-.if exists(${X11BASE}/lib/libXft.so) && !defined(NO_AA)
-PORTREVISION=	2
-.endif
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
 DISTNAME=	qt-x11-${PORTVERSION}
@@ -28,13 +26,12 @@ 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 \
+		-system-libmng -thread -no-opengl \
 		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 CONFIGURE_ENV=	${YES} yes | QTDIR=${WRKSRC}
 MAKE_ARGS+=	MAKE="${GMAKE} -j2"
@@ -98,7 +95,9 @@ do-install:
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qt2
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/libqt2.so.4 ${PREFIX}/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/libqt2-mt.so.4 ${PREFIX}/lib
 	${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
 .if defined(WANT_STATIC)
diff --git a/x11-toolkits/qt31/pkg-plist b/x11-toolkits/qt31/pkg-plist
index 5b26f2baddfe..4089bfe38f70 100644
--- a/x11-toolkits/qt31/pkg-plist
+++ b/x11-toolkits/qt31/pkg-plist
@@ -286,6 +286,8 @@ 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/libqutil.so
 lib/libqutil.so.1
 share/doc/qt2/ANNOUNCE
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index 6c597d5eccc4..ea89d309c284 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -7,9 +7,7 @@
 
 PORTNAME=	qt
 PORTVERSION=	2.2.3
-.if exists(${X11BASE}/lib/libXft.so) && !defined(NO_AA)
-PORTREVISION=	2
-.endif
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
 DISTNAME=	qt-x11-${PORTVERSION}
@@ -28,13 +26,12 @@ 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 \
+		-system-libmng -thread -no-opengl \
 		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 CONFIGURE_ENV=	${YES} yes | QTDIR=${WRKSRC}
 MAKE_ARGS+=	MAKE="${GMAKE} -j2"
@@ -98,7 +95,9 @@ do-install:
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qt2
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/libqt2.so.4 ${PREFIX}/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/libqt2-mt.so.4 ${PREFIX}/lib
 	${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
 .if defined(WANT_STATIC)
diff --git a/x11-toolkits/qt32/pkg-plist b/x11-toolkits/qt32/pkg-plist
index 5b26f2baddfe..4089bfe38f70 100644
--- a/x11-toolkits/qt32/pkg-plist
+++ b/x11-toolkits/qt32/pkg-plist
@@ -286,6 +286,8 @@ 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/libqutil.so
 lib/libqutil.so.1
 share/doc/qt2/ANNOUNCE
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index 6c597d5eccc4..ea89d309c284 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -7,9 +7,7 @@
 
 PORTNAME=	qt
 PORTVERSION=	2.2.3
-.if exists(${X11BASE}/lib/libXft.so) && !defined(NO_AA)
-PORTREVISION=	2
-.endif
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
 DISTNAME=	qt-x11-${PORTVERSION}
@@ -28,13 +26,12 @@ 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 \
+		-system-libmng -thread -no-opengl \
 		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 CONFIGURE_ENV=	${YES} yes | QTDIR=${WRKSRC}
 MAKE_ARGS+=	MAKE="${GMAKE} -j2"
@@ -98,7 +95,9 @@ do-install:
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qt2
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/libqt2.so.4 ${PREFIX}/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/libqt2-mt.so.4 ${PREFIX}/lib
 	${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
 .if defined(WANT_STATIC)
diff --git a/x11-toolkits/qt33/pkg-plist b/x11-toolkits/qt33/pkg-plist
index 5b26f2baddfe..4089bfe38f70 100644
--- a/x11-toolkits/qt33/pkg-plist
+++ b/x11-toolkits/qt33/pkg-plist
@@ -286,6 +286,8 @@ 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/libqutil.so
 lib/libqutil.so.1
 share/doc/qt2/ANNOUNCE