12 files changed, 108 insertions, 54 deletions

diff --git a/x11-toolkits/qt22/Makefile b/x11-toolkits/qt22/Makefile
index ecad37d0a72c..e7fc891de579 100644
--- a/x11-toolkits/qt22/Makefile
+++ b/x11-toolkits/qt22/Makefile
@@ -34,7 +34,7 @@ USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-system-zlib -system-libpng -system-jpeg -sm -gif \
-		-system-libmng \
+		-system-libmng -thread \
 		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 CONFIGURE_ENV=	${YES} yes | QTDIR=${WRKSRC}
 MAKE_ARGS+=	MAKE="${GMAKE} -j2"
@@ -72,7 +72,7 @@ pre-configure:
 		-e "s,-pipe -O2,${CXXFLAGS},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,= -I${X11BASE}/include,= -DQT_XFT -I${X11BASE}/include,g" \
+	${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
diff --git a/x11-toolkits/qt22/files/patch-aa b/x11-toolkits/qt22/files/patch-aa
index 3d4d707124a0..67443ca0c1d4 100644
--- a/x11-toolkits/qt22/files/patch-aa
+++ b/x11-toolkits/qt22/files/patch-aa
@@ -1,15 +1,24 @@
---- configs/freebsd-g++-shared.orig	Wed Oct  4 12:55:10 2000
-+++ configs/freebsd-g++-shared	Sat Nov 18 20:02:27 2000
-@@ -22,7 +22,7 @@
+--- configs/freebsd-g++-shared	Sun Dec 24 02:41:35 2000
++++ configs/freebsd-g++-shared.new	Sun Dec 24 02:42:49 2000
+@@ -6,7 +6,7 @@
+ 
+ # Compiling with support libraries
+ SYSCONF_CXXFLAGS_X11	= -I/usr/X11R6/include
+-SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include
++SYSCONF_CXXFLAGS_QT= -I$(QTDIR)/include $(SYSCONF_CXXFLAGS_THREAD)
+ SYSCONF_CXXFLAGS_OPENGL	= -I/usr/X11R6/include
+ 
+ # Compiling YACC output
+@@ -23,7 +23,7 @@
  SYSCONF_LIBS_X11	= -lXext -lX11 -lm
  # Qt, Qt+OpenGL
  SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
 -SYSCONF_LIBS_QT		= -lqt$(QT_THREAD_SUFFIX)
-+SYSCONF_LIBS_QT		= -lqt2$(QT_THREAD_SUFFIX)
++SYSCONF_LIBS_QT		= -lqt2$(QT_THREAD_SUFFIX) $(SYSCONF_LFLAGS_THREAD)
  SYSCONF_LIBS_QT_OPENGL	= 
  # OpenGL
  SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
-@@ -45,7 +45,7 @@
+@@ -46,7 +46,7 @@
  SYSCONF_LIBS_THREAD	= 
  
  # Meta-object compiler
@@ -18,7 +27,7 @@
  
  # UI compiler
  SYSCONF_UIC		= $(QTDIR)/bin/uic
-@@ -56,16 +56,14 @@
+@@ -57,16 +57,14 @@
  #   - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
  #
  SYSCONF_LINK_SHLIB	= g++
@@ -38,7 +47,7 @@
  
  # Linking static libraries
  #   - Build the $(TARGET) library, eg. lib$(TARGET).a
-@@ -76,8 +74,8 @@
+@@ -77,8 +75,8 @@
  SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
  				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
  # Compiling application source
diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile
index ecad37d0a72c..e7fc891de579 100644
--- a/x11-toolkits/qt23/Makefile
+++ b/x11-toolkits/qt23/Makefile
@@ -34,7 +34,7 @@ USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-system-zlib -system-libpng -system-jpeg -sm -gif \
-		-system-libmng \
+		-system-libmng -thread \
 		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 CONFIGURE_ENV=	${YES} yes | QTDIR=${WRKSRC}
 MAKE_ARGS+=	MAKE="${GMAKE} -j2"
@@ -72,7 +72,7 @@ pre-configure:
 		-e "s,-pipe -O2,${CXXFLAGS},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,= -I${X11BASE}/include,= -DQT_XFT -I${X11BASE}/include,g" \
+	${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
diff --git a/x11-toolkits/qt23/files/patch-aa b/x11-toolkits/qt23/files/patch-aa
index 3d4d707124a0..67443ca0c1d4 100644
--- a/x11-toolkits/qt23/files/patch-aa
+++ b/x11-toolkits/qt23/files/patch-aa
@@ -1,15 +1,24 @@
---- configs/freebsd-g++-shared.orig	Wed Oct  4 12:55:10 2000
-+++ configs/freebsd-g++-shared	Sat Nov 18 20:02:27 2000
-@@ -22,7 +22,7 @@
+--- configs/freebsd-g++-shared	Sun Dec 24 02:41:35 2000
++++ configs/freebsd-g++-shared.new	Sun Dec 24 02:42:49 2000
+@@ -6,7 +6,7 @@
+ 
+ # Compiling with support libraries
+ SYSCONF_CXXFLAGS_X11	= -I/usr/X11R6/include
+-SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include
++SYSCONF_CXXFLAGS_QT= -I$(QTDIR)/include $(SYSCONF_CXXFLAGS_THREAD)
+ SYSCONF_CXXFLAGS_OPENGL	= -I/usr/X11R6/include
+ 
+ # Compiling YACC output
+@@ -23,7 +23,7 @@
  SYSCONF_LIBS_X11	= -lXext -lX11 -lm
  # Qt, Qt+OpenGL
  SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
 -SYSCONF_LIBS_QT		= -lqt$(QT_THREAD_SUFFIX)
-+SYSCONF_LIBS_QT		= -lqt2$(QT_THREAD_SUFFIX)
++SYSCONF_LIBS_QT		= -lqt2$(QT_THREAD_SUFFIX) $(SYSCONF_LFLAGS_THREAD)
  SYSCONF_LIBS_QT_OPENGL	= 
  # OpenGL
  SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
-@@ -45,7 +45,7 @@
+@@ -46,7 +46,7 @@
  SYSCONF_LIBS_THREAD	= 
  
  # Meta-object compiler
@@ -18,7 +27,7 @@
  
  # UI compiler
  SYSCONF_UIC		= $(QTDIR)/bin/uic
-@@ -56,16 +56,14 @@
+@@ -57,16 +57,14 @@
  #   - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
  #
  SYSCONF_LINK_SHLIB	= g++
@@ -38,7 +47,7 @@
  
  # Linking static libraries
  #   - Build the $(TARGET) library, eg. lib$(TARGET).a
-@@ -76,8 +74,8 @@
+@@ -77,8 +75,8 @@
  SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
  				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
  # Compiling application source
diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile
index ecad37d0a72c..e7fc891de579 100644
--- a/x11-toolkits/qt30/Makefile
+++ b/x11-toolkits/qt30/Makefile
@@ -34,7 +34,7 @@ USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-system-zlib -system-libpng -system-jpeg -sm -gif \
-		-system-libmng \
+		-system-libmng -thread \
 		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 CONFIGURE_ENV=	${YES} yes | QTDIR=${WRKSRC}
 MAKE_ARGS+=	MAKE="${GMAKE} -j2"
@@ -72,7 +72,7 @@ pre-configure:
 		-e "s,-pipe -O2,${CXXFLAGS},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,= -I${X11BASE}/include,= -DQT_XFT -I${X11BASE}/include,g" \
+	${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
diff --git a/x11-toolkits/qt30/files/patch-aa b/x11-toolkits/qt30/files/patch-aa
index 3d4d707124a0..67443ca0c1d4 100644
--- a/x11-toolkits/qt30/files/patch-aa
+++ b/x11-toolkits/qt30/files/patch-aa
@@ -1,15 +1,24 @@
---- configs/freebsd-g++-shared.orig	Wed Oct  4 12:55:10 2000
-+++ configs/freebsd-g++-shared	Sat Nov 18 20:02:27 2000
-@@ -22,7 +22,7 @@
+--- configs/freebsd-g++-shared	Sun Dec 24 02:41:35 2000
++++ configs/freebsd-g++-shared.new	Sun Dec 24 02:42:49 2000
+@@ -6,7 +6,7 @@
+ 
+ # Compiling with support libraries
+ SYSCONF_CXXFLAGS_X11	= -I/usr/X11R6/include
+-SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include
++SYSCONF_CXXFLAGS_QT= -I$(QTDIR)/include $(SYSCONF_CXXFLAGS_THREAD)
+ SYSCONF_CXXFLAGS_OPENGL	= -I/usr/X11R6/include
+ 
+ # Compiling YACC output
+@@ -23,7 +23,7 @@
  SYSCONF_LIBS_X11	= -lXext -lX11 -lm
  # Qt, Qt+OpenGL
  SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
 -SYSCONF_LIBS_QT		= -lqt$(QT_THREAD_SUFFIX)
-+SYSCONF_LIBS_QT		= -lqt2$(QT_THREAD_SUFFIX)
++SYSCONF_LIBS_QT		= -lqt2$(QT_THREAD_SUFFIX) $(SYSCONF_LFLAGS_THREAD)
  SYSCONF_LIBS_QT_OPENGL	= 
  # OpenGL
  SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
-@@ -45,7 +45,7 @@
+@@ -46,7 +46,7 @@
  SYSCONF_LIBS_THREAD	= 
  
  # Meta-object compiler
@@ -18,7 +27,7 @@
  
  # UI compiler
  SYSCONF_UIC		= $(QTDIR)/bin/uic
-@@ -56,16 +56,14 @@
+@@ -57,16 +57,14 @@
  #   - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
  #
  SYSCONF_LINK_SHLIB	= g++
@@ -38,7 +47,7 @@
  
  # Linking static libraries
  #   - Build the $(TARGET) library, eg. lib$(TARGET).a
-@@ -76,8 +74,8 @@
+@@ -77,8 +75,8 @@
  SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
  				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
  # Compiling application source
diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index ecad37d0a72c..e7fc891de579 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -34,7 +34,7 @@ USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-system-zlib -system-libpng -system-jpeg -sm -gif \
-		-system-libmng \
+		-system-libmng -thread \
 		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 CONFIGURE_ENV=	${YES} yes | QTDIR=${WRKSRC}
 MAKE_ARGS+=	MAKE="${GMAKE} -j2"
@@ -72,7 +72,7 @@ pre-configure:
 		-e "s,-pipe -O2,${CXXFLAGS},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,= -I${X11BASE}/include,= -DQT_XFT -I${X11BASE}/include,g" \
+	${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
diff --git a/x11-toolkits/qt31/files/patch-aa b/x11-toolkits/qt31/files/patch-aa
index 3d4d707124a0..67443ca0c1d4 100644
--- a/x11-toolkits/qt31/files/patch-aa
+++ b/x11-toolkits/qt31/files/patch-aa
@@ -1,15 +1,24 @@
---- configs/freebsd-g++-shared.orig	Wed Oct  4 12:55:10 2000
-+++ configs/freebsd-g++-shared	Sat Nov 18 20:02:27 2000
-@@ -22,7 +22,7 @@
+--- configs/freebsd-g++-shared	Sun Dec 24 02:41:35 2000
++++ configs/freebsd-g++-shared.new	Sun Dec 24 02:42:49 2000
+@@ -6,7 +6,7 @@
+ 
+ # Compiling with support libraries
+ SYSCONF_CXXFLAGS_X11	= -I/usr/X11R6/include
+-SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include
++SYSCONF_CXXFLAGS_QT= -I$(QTDIR)/include $(SYSCONF_CXXFLAGS_THREAD)
+ SYSCONF_CXXFLAGS_OPENGL	= -I/usr/X11R6/include
+ 
+ # Compiling YACC output
+@@ -23,7 +23,7 @@
  SYSCONF_LIBS_X11	= -lXext -lX11 -lm
  # Qt, Qt+OpenGL
  SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
 -SYSCONF_LIBS_QT		= -lqt$(QT_THREAD_SUFFIX)
-+SYSCONF_LIBS_QT		= -lqt2$(QT_THREAD_SUFFIX)
++SYSCONF_LIBS_QT		= -lqt2$(QT_THREAD_SUFFIX) $(SYSCONF_LFLAGS_THREAD)
  SYSCONF_LIBS_QT_OPENGL	= 
  # OpenGL
  SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
-@@ -45,7 +45,7 @@
+@@ -46,7 +46,7 @@
  SYSCONF_LIBS_THREAD	= 
  
  # Meta-object compiler
@@ -18,7 +27,7 @@
  
  # UI compiler
  SYSCONF_UIC		= $(QTDIR)/bin/uic
-@@ -56,16 +56,14 @@
+@@ -57,16 +57,14 @@
  #   - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
  #
  SYSCONF_LINK_SHLIB	= g++
@@ -38,7 +47,7 @@
  
  # Linking static libraries
  #   - Build the $(TARGET) library, eg. lib$(TARGET).a
-@@ -76,8 +74,8 @@
+@@ -77,8 +75,8 @@
  SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
  				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
  # Compiling application source
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index ecad37d0a72c..e7fc891de579 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -34,7 +34,7 @@ USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-system-zlib -system-libpng -system-jpeg -sm -gif \
-		-system-libmng \
+		-system-libmng -thread \
 		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 CONFIGURE_ENV=	${YES} yes | QTDIR=${WRKSRC}
 MAKE_ARGS+=	MAKE="${GMAKE} -j2"
@@ -72,7 +72,7 @@ pre-configure:
 		-e "s,-pipe -O2,${CXXFLAGS},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,= -I${X11BASE}/include,= -DQT_XFT -I${X11BASE}/include,g" \
+	${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
diff --git a/x11-toolkits/qt32/files/patch-aa b/x11-toolkits/qt32/files/patch-aa
index 3d4d707124a0..67443ca0c1d4 100644
--- a/x11-toolkits/qt32/files/patch-aa
+++ b/x11-toolkits/qt32/files/patch-aa
@@ -1,15 +1,24 @@
---- configs/freebsd-g++-shared.orig	Wed Oct  4 12:55:10 2000
-+++ configs/freebsd-g++-shared	Sat Nov 18 20:02:27 2000
-@@ -22,7 +22,7 @@
+--- configs/freebsd-g++-shared	Sun Dec 24 02:41:35 2000
++++ configs/freebsd-g++-shared.new	Sun Dec 24 02:42:49 2000
+@@ -6,7 +6,7 @@
+ 
+ # Compiling with support libraries
+ SYSCONF_CXXFLAGS_X11	= -I/usr/X11R6/include
+-SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include
++SYSCONF_CXXFLAGS_QT= -I$(QTDIR)/include $(SYSCONF_CXXFLAGS_THREAD)
+ SYSCONF_CXXFLAGS_OPENGL	= -I/usr/X11R6/include
+ 
+ # Compiling YACC output
+@@ -23,7 +23,7 @@
  SYSCONF_LIBS_X11	= -lXext -lX11 -lm
  # Qt, Qt+OpenGL
  SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
 -SYSCONF_LIBS_QT		= -lqt$(QT_THREAD_SUFFIX)
-+SYSCONF_LIBS_QT		= -lqt2$(QT_THREAD_SUFFIX)
++SYSCONF_LIBS_QT		= -lqt2$(QT_THREAD_SUFFIX) $(SYSCONF_LFLAGS_THREAD)
  SYSCONF_LIBS_QT_OPENGL	= 
  # OpenGL
  SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
-@@ -45,7 +45,7 @@
+@@ -46,7 +46,7 @@
  SYSCONF_LIBS_THREAD	= 
  
  # Meta-object compiler
@@ -18,7 +27,7 @@
  
  # UI compiler
  SYSCONF_UIC		= $(QTDIR)/bin/uic
-@@ -56,16 +56,14 @@
+@@ -57,16 +57,14 @@
  #   - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
  #
  SYSCONF_LINK_SHLIB	= g++
@@ -38,7 +47,7 @@
  
  # Linking static libraries
  #   - Build the $(TARGET) library, eg. lib$(TARGET).a
-@@ -76,8 +74,8 @@
+@@ -77,8 +75,8 @@
  SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
  				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
  # Compiling application source
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index ecad37d0a72c..e7fc891de579 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -34,7 +34,7 @@ USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-system-zlib -system-libpng -system-jpeg -sm -gif \
-		-system-libmng \
+		-system-libmng -thread \
 		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 CONFIGURE_ENV=	${YES} yes | QTDIR=${WRKSRC}
 MAKE_ARGS+=	MAKE="${GMAKE} -j2"
@@ -72,7 +72,7 @@ pre-configure:
 		-e "s,-pipe -O2,${CXXFLAGS},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,= -I${X11BASE}/include,= -DQT_XFT -I${X11BASE}/include,g" \
+	${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
diff --git a/x11-toolkits/qt33/files/patch-aa b/x11-toolkits/qt33/files/patch-aa
index 3d4d707124a0..67443ca0c1d4 100644
--- a/x11-toolkits/qt33/files/patch-aa
+++ b/x11-toolkits/qt33/files/patch-aa
@@ -1,15 +1,24 @@
---- configs/freebsd-g++-shared.orig	Wed Oct  4 12:55:10 2000
-+++ configs/freebsd-g++-shared	Sat Nov 18 20:02:27 2000
-@@ -22,7 +22,7 @@
+--- configs/freebsd-g++-shared	Sun Dec 24 02:41:35 2000
++++ configs/freebsd-g++-shared.new	Sun Dec 24 02:42:49 2000
+@@ -6,7 +6,7 @@
+ 
+ # Compiling with support libraries
+ SYSCONF_CXXFLAGS_X11	= -I/usr/X11R6/include
+-SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include
++SYSCONF_CXXFLAGS_QT= -I$(QTDIR)/include $(SYSCONF_CXXFLAGS_THREAD)
+ SYSCONF_CXXFLAGS_OPENGL	= -I/usr/X11R6/include
+ 
+ # Compiling YACC output
+@@ -23,7 +23,7 @@
  SYSCONF_LIBS_X11	= -lXext -lX11 -lm
  # Qt, Qt+OpenGL
  SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
 -SYSCONF_LIBS_QT		= -lqt$(QT_THREAD_SUFFIX)
-+SYSCONF_LIBS_QT		= -lqt2$(QT_THREAD_SUFFIX)
++SYSCONF_LIBS_QT		= -lqt2$(QT_THREAD_SUFFIX) $(SYSCONF_LFLAGS_THREAD)
  SYSCONF_LIBS_QT_OPENGL	= 
  # OpenGL
  SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
-@@ -45,7 +45,7 @@
+@@ -46,7 +46,7 @@
  SYSCONF_LIBS_THREAD	= 
  
  # Meta-object compiler
@@ -18,7 +27,7 @@
  
  # UI compiler
  SYSCONF_UIC		= $(QTDIR)/bin/uic
-@@ -56,16 +56,14 @@
+@@ -57,16 +57,14 @@
  #   - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
  #
  SYSCONF_LINK_SHLIB	= g++
@@ -38,7 +47,7 @@
  
  # Linking static libraries
  #   - Build the $(TARGET) library, eg. lib$(TARGET).a
-@@ -76,8 +74,8 @@
+@@ -77,8 +75,8 @@
  SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
  				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
  # Compiling application source