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)

11 files changed, 64 insertions, 380 deletions

diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 8ce6abfc9403..c6cff7b719dc 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -24,30 +24,7 @@ USE_XPM=	yes
 USE_BZIP2=	yes
 USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
-USE_AUTOCONF=	yes
-
-.include <bsd.port.pre.mk>
-
-# Hack to make pthread support work correctly.
-.if exists(${X11BASE}/lib/libqt2-mt.so)
-.if exists(${X11BASE}/lib/libXThrStub.so)
-QTNAME=		qt2-mt
-.if ${OSVERSION} >= 500016
-PTHREAD_CFLAGS=
-PTHREAD_LIBS=	-lc_r
-.else
-PTHREAD_CFLAGS=	-D_THREAD_SAFE
-PTHREAD_LIBS=	-pthread
-.endif
-.else
-QTNAME=		qt2
-PTHREAD_CFLAGS=
-PTHREAD_LIBS=
-.endif
-.endif
-
-CFLAGS+=	${PTHREAD_CFLAGS} ${PTHREAD_LIBS}
-LDFLAGS+=	${PTHREAD_LIBS}
+GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--with-qt-dir=${X11BASE} \
@@ -56,10 +33,9 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--with-extra-libs=${LOCALBASE}/lib \
 		--without-ldap \
 		--disable-closure
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \
-		MOC="${MOC}" LIBQT="-l${QTNAME}" LIBQTFILE="lib${QTNAME}" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" \
-		LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}"
+CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" \
+		CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \
+		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}"
 USE_GMAKE=	yes
 
 pre-configure:
@@ -68,9 +44,4 @@ pre-configure:
 	${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in
 	${PERL} -pi -e "s@TIME_WITH_SYS_TIME@INVALID_FOO@g" ${WRKSRC}/kioslave/ldap/kldap.h
 
-post-configure:
-	@${CP} ${WRKSRC}/libtool ${WRKSRC}/libtool.orig
-	${SED} -e 's@\\\$$compiler_flags@\\\$$compiler_flags ${PTHREAD_LIBS}@g' ${WRKSRC}/libtool.orig \
-		> ${WRKSRC}/libtool
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 8ce6abfc9403..c6cff7b719dc 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -24,30 +24,7 @@ USE_XPM=	yes
 USE_BZIP2=	yes
 USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
-USE_AUTOCONF=	yes
-
-.include <bsd.port.pre.mk>
-
-# Hack to make pthread support work correctly.
-.if exists(${X11BASE}/lib/libqt2-mt.so)
-.if exists(${X11BASE}/lib/libXThrStub.so)
-QTNAME=		qt2-mt
-.if ${OSVERSION} >= 500016
-PTHREAD_CFLAGS=
-PTHREAD_LIBS=	-lc_r
-.else
-PTHREAD_CFLAGS=	-D_THREAD_SAFE
-PTHREAD_LIBS=	-pthread
-.endif
-.else
-QTNAME=		qt2
-PTHREAD_CFLAGS=
-PTHREAD_LIBS=
-.endif
-.endif
-
-CFLAGS+=	${PTHREAD_CFLAGS} ${PTHREAD_LIBS}
-LDFLAGS+=	${PTHREAD_LIBS}
+GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--with-qt-dir=${X11BASE} \
@@ -56,10 +33,9 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--with-extra-libs=${LOCALBASE}/lib \
 		--without-ldap \
 		--disable-closure
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \
-		MOC="${MOC}" LIBQT="-l${QTNAME}" LIBQTFILE="lib${QTNAME}" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" \
-		LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}"
+CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" \
+		CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \
+		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}"
 USE_GMAKE=	yes
 
 pre-configure:
@@ -68,9 +44,4 @@ pre-configure:
 	${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in
 	${PERL} -pi -e "s@TIME_WITH_SYS_TIME@INVALID_FOO@g" ${WRKSRC}/kioslave/ldap/kldap.h
 
-post-configure:
-	@${CP} ${WRKSRC}/libtool ${WRKSRC}/libtool.orig
-	${SED} -e 's@\\\$$compiler_flags@\\\$$compiler_flags ${PTHREAD_LIBS}@g' ${WRKSRC}/libtool.orig \
-		> ${WRKSRC}/libtool
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 8ce6abfc9403..c6cff7b719dc 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -24,30 +24,7 @@ USE_XPM=	yes
 USE_BZIP2=	yes
 USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
-USE_AUTOCONF=	yes
-
-.include <bsd.port.pre.mk>
-
-# Hack to make pthread support work correctly.
-.if exists(${X11BASE}/lib/libqt2-mt.so)
-.if exists(${X11BASE}/lib/libXThrStub.so)
-QTNAME=		qt2-mt
-.if ${OSVERSION} >= 500016
-PTHREAD_CFLAGS=
-PTHREAD_LIBS=	-lc_r
-.else
-PTHREAD_CFLAGS=	-D_THREAD_SAFE
-PTHREAD_LIBS=	-pthread
-.endif
-.else
-QTNAME=		qt2
-PTHREAD_CFLAGS=
-PTHREAD_LIBS=
-.endif
-.endif
-
-CFLAGS+=	${PTHREAD_CFLAGS} ${PTHREAD_LIBS}
-LDFLAGS+=	${PTHREAD_LIBS}
+GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--with-qt-dir=${X11BASE} \
@@ -56,10 +33,9 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--with-extra-libs=${LOCALBASE}/lib \
 		--without-ldap \
 		--disable-closure
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \
-		MOC="${MOC}" LIBQT="-l${QTNAME}" LIBQTFILE="lib${QTNAME}" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" \
-		LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}"
+CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" \
+		CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \
+		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}"
 USE_GMAKE=	yes
 
 pre-configure:
@@ -68,9 +44,4 @@ pre-configure:
 	${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in
 	${PERL} -pi -e "s@TIME_WITH_SYS_TIME@INVALID_FOO@g" ${WRKSRC}/kioslave/ldap/kldap.h
 
-post-configure:
-	@${CP} ${WRKSRC}/libtool ${WRKSRC}/libtool.orig
-	${SED} -e 's@\\\$$compiler_flags@\\\$$compiler_flags ${PTHREAD_LIBS}@g' ${WRKSRC}/libtool.orig \
-		> ${WRKSRC}/libtool
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index 8ce6abfc9403..c6cff7b719dc 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -24,30 +24,7 @@ USE_XPM=	yes
 USE_BZIP2=	yes
 USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
-USE_AUTOCONF=	yes
-
-.include <bsd.port.pre.mk>
-
-# Hack to make pthread support work correctly.
-.if exists(${X11BASE}/lib/libqt2-mt.so)
-.if exists(${X11BASE}/lib/libXThrStub.so)
-QTNAME=		qt2-mt
-.if ${OSVERSION} >= 500016
-PTHREAD_CFLAGS=
-PTHREAD_LIBS=	-lc_r
-.else
-PTHREAD_CFLAGS=	-D_THREAD_SAFE
-PTHREAD_LIBS=	-pthread
-.endif
-.else
-QTNAME=		qt2
-PTHREAD_CFLAGS=
-PTHREAD_LIBS=
-.endif
-.endif
-
-CFLAGS+=	${PTHREAD_CFLAGS} ${PTHREAD_LIBS}
-LDFLAGS+=	${PTHREAD_LIBS}
+GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--with-qt-dir=${X11BASE} \
@@ -56,10 +33,9 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--with-extra-libs=${LOCALBASE}/lib \
 		--without-ldap \
 		--disable-closure
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \
-		MOC="${MOC}" LIBQT="-l${QTNAME}" LIBQTFILE="lib${QTNAME}" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" \
-		LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}"
+CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" \
+		CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \
+		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}"
 USE_GMAKE=	yes
 
 pre-configure:
@@ -68,9 +44,4 @@ pre-configure:
 	${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in
 	${PERL} -pi -e "s@TIME_WITH_SYS_TIME@INVALID_FOO@g" ${WRKSRC}/kioslave/ldap/kldap.h
 
-post-configure:
-	@${CP} ${WRKSRC}/libtool ${WRKSRC}/libtool.orig
-	${SED} -e 's@\\\$$compiler_flags@\\\$$compiler_flags ${PTHREAD_LIBS}@g' ${WRKSRC}/libtool.orig \
-		> ${WRKSRC}/libtool
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 8ce6abfc9403..c6cff7b719dc 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -24,30 +24,7 @@ USE_XPM=	yes
 USE_BZIP2=	yes
 USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
-USE_AUTOCONF=	yes
-
-.include <bsd.port.pre.mk>
-
-# Hack to make pthread support work correctly.
-.if exists(${X11BASE}/lib/libqt2-mt.so)
-.if exists(${X11BASE}/lib/libXThrStub.so)
-QTNAME=		qt2-mt
-.if ${OSVERSION} >= 500016
-PTHREAD_CFLAGS=
-PTHREAD_LIBS=	-lc_r
-.else
-PTHREAD_CFLAGS=	-D_THREAD_SAFE
-PTHREAD_LIBS=	-pthread
-.endif
-.else
-QTNAME=		qt2
-PTHREAD_CFLAGS=
-PTHREAD_LIBS=
-.endif
-.endif
-
-CFLAGS+=	${PTHREAD_CFLAGS} ${PTHREAD_LIBS}
-LDFLAGS+=	${PTHREAD_LIBS}
+GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--with-qt-dir=${X11BASE} \
@@ -56,10 +33,9 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--with-extra-libs=${LOCALBASE}/lib \
 		--without-ldap \
 		--disable-closure
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \
-		MOC="${MOC}" LIBQT="-l${QTNAME}" LIBQTFILE="lib${QTNAME}" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" \
-		LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}"
+CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" \
+		CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \
+		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}"
 USE_GMAKE=	yes
 
 pre-configure:
@@ -68,9 +44,4 @@ pre-configure:
 	${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in
 	${PERL} -pi -e "s@TIME_WITH_SYS_TIME@INVALID_FOO@g" ${WRKSRC}/kioslave/ldap/kldap.h
 
-post-configure:
-	@${CP} ${WRKSRC}/libtool ${WRKSRC}/libtool.orig
-	${SED} -e 's@\\\$$compiler_flags@\\\$$compiler_flags ${PTHREAD_LIBS}@g' ${WRKSRC}/libtool.orig \
-		> ${WRKSRC}/libtool
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 8ce6abfc9403..c6cff7b719dc 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -24,30 +24,7 @@ USE_XPM=	yes
 USE_BZIP2=	yes
 USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
-USE_AUTOCONF=	yes
-
-.include <bsd.port.pre.mk>
-
-# Hack to make pthread support work correctly.
-.if exists(${X11BASE}/lib/libqt2-mt.so)
-.if exists(${X11BASE}/lib/libXThrStub.so)
-QTNAME=		qt2-mt
-.if ${OSVERSION} >= 500016
-PTHREAD_CFLAGS=
-PTHREAD_LIBS=	-lc_r
-.else
-PTHREAD_CFLAGS=	-D_THREAD_SAFE
-PTHREAD_LIBS=	-pthread
-.endif
-.else
-QTNAME=		qt2
-PTHREAD_CFLAGS=
-PTHREAD_LIBS=
-.endif
-.endif
-
-CFLAGS+=	${PTHREAD_CFLAGS} ${PTHREAD_LIBS}
-LDFLAGS+=	${PTHREAD_LIBS}
+GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--with-qt-dir=${X11BASE} \
@@ -56,10 +33,9 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--with-extra-libs=${LOCALBASE}/lib \
 		--without-ldap \
 		--disable-closure
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \
-		MOC="${MOC}" LIBQT="-l${QTNAME}" LIBQTFILE="lib${QTNAME}" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" \
-		LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}"
+CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" \
+		CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \
+		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}"
 USE_GMAKE=	yes
 
 pre-configure:
@@ -68,9 +44,4 @@ pre-configure:
 	${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in
 	${PERL} -pi -e "s@TIME_WITH_SYS_TIME@INVALID_FOO@g" ${WRKSRC}/kioslave/ldap/kldap.h
 
-post-configure:
-	@${CP} ${WRKSRC}/libtool ${WRKSRC}/libtool.orig
-	${SED} -e 's@\\\$$compiler_flags@\\\$$compiler_flags ${PTHREAD_LIBS}@g' ${WRKSRC}/libtool.orig \
-		> ${WRKSRC}/libtool
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 8ce6abfc9403..c6cff7b719dc 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -24,30 +24,7 @@ USE_XPM=	yes
 USE_BZIP2=	yes
 USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
-USE_AUTOCONF=	yes
-
-.include <bsd.port.pre.mk>
-
-# Hack to make pthread support work correctly.
-.if exists(${X11BASE}/lib/libqt2-mt.so)
-.if exists(${X11BASE}/lib/libXThrStub.so)
-QTNAME=		qt2-mt
-.if ${OSVERSION} >= 500016
-PTHREAD_CFLAGS=
-PTHREAD_LIBS=	-lc_r
-.else
-PTHREAD_CFLAGS=	-D_THREAD_SAFE
-PTHREAD_LIBS=	-pthread
-.endif
-.else
-QTNAME=		qt2
-PTHREAD_CFLAGS=
-PTHREAD_LIBS=
-.endif
-.endif
-
-CFLAGS+=	${PTHREAD_CFLAGS} ${PTHREAD_LIBS}
-LDFLAGS+=	${PTHREAD_LIBS}
+GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--with-qt-dir=${X11BASE} \
@@ -56,10 +33,9 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--with-extra-libs=${LOCALBASE}/lib \
 		--without-ldap \
 		--disable-closure
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \
-		MOC="${MOC}" LIBQT="-l${QTNAME}" LIBQTFILE="lib${QTNAME}" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" \
-		LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}"
+CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" \
+		CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \
+		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}"
 USE_GMAKE=	yes
 
 pre-configure:
@@ -68,9 +44,4 @@ pre-configure:
 	${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in
 	${PERL} -pi -e "s@TIME_WITH_SYS_TIME@INVALID_FOO@g" ${WRKSRC}/kioslave/ldap/kldap.h
 
-post-configure:
-	@${CP} ${WRKSRC}/libtool ${WRKSRC}/libtool.orig
-	${SED} -e 's@\\\$$compiler_flags@\\\$$compiler_flags ${PTHREAD_LIBS}@g' ${WRKSRC}/libtool.orig \
-		> ${WRKSRC}/libtool
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 8ce6abfc9403..c6cff7b719dc 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -24,30 +24,7 @@ USE_XPM=	yes
 USE_BZIP2=	yes
 USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
-USE_AUTOCONF=	yes
-
-.include <bsd.port.pre.mk>
-
-# Hack to make pthread support work correctly.
-.if exists(${X11BASE}/lib/libqt2-mt.so)
-.if exists(${X11BASE}/lib/libXThrStub.so)
-QTNAME=		qt2-mt
-.if ${OSVERSION} >= 500016
-PTHREAD_CFLAGS=
-PTHREAD_LIBS=	-lc_r
-.else
-PTHREAD_CFLAGS=	-D_THREAD_SAFE
-PTHREAD_LIBS=	-pthread
-.endif
-.else
-QTNAME=		qt2
-PTHREAD_CFLAGS=
-PTHREAD_LIBS=
-.endif
-.endif
-
-CFLAGS+=	${PTHREAD_CFLAGS} ${PTHREAD_LIBS}
-LDFLAGS+=	${PTHREAD_LIBS}
+GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--with-qt-dir=${X11BASE} \
@@ -56,10 +33,9 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--with-extra-libs=${LOCALBASE}/lib \
 		--without-ldap \
 		--disable-closure
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \
-		MOC="${MOC}" LIBQT="-l${QTNAME}" LIBQTFILE="lib${QTNAME}" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" \
-		LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}"
+CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" \
+		CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \
+		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}"
 USE_GMAKE=	yes
 
 pre-configure:
@@ -68,9 +44,4 @@ pre-configure:
 	${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in
 	${PERL} -pi -e "s@TIME_WITH_SYS_TIME@INVALID_FOO@g" ${WRKSRC}/kioslave/ldap/kldap.h
 
-post-configure:
-	@${CP} ${WRKSRC}/libtool ${WRKSRC}/libtool.orig
-	${SED} -e 's@\\\$$compiler_flags@\\\$$compiler_flags ${PTHREAD_LIBS}@g' ${WRKSRC}/libtool.orig \
-		> ${WRKSRC}/libtool
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index 08b63213a6bd..170ff7b40d45 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -27,40 +27,18 @@ USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 
-.include <bsd.port.pre.mk>
-
-# Hack to make pthread support work correctly.
-.if exists(${X11BASE}/lib/libqt2-mt.so)
-.if exists(${X11BASE}/lib/libXThrStub.so)
-QTNAME=		qt2-mt
-.if ${OSVERSION} >= 500016
-PTHREAD_CFLAGS=
-PTHREAD_LIBS=	-lc_r
-.else
-PTHREAD_CFLAGS=	-D_THREAD_SAFE
-PTHREAD_LIBS=	-pthread
-.endif
-.else
-QTNAME=		qt2
-PTHREAD_CFLAGS=
-PTHREAD_LIBS=
-.endif
-.endif
-
-CFLAGS+=	${PTHREAD_CFLAGS} ${PTHREAD_LIBS}
-LDFLAGS+=	${PTHREAD_LIBS}
-
 CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 		--with-qt-libraries=${X11BASE}/lib \
 		--with-extra-libs=${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \
-		MOC="${MOC}" LIBQT="-l${QTNAME}" LIBQTFILE="lib${QTNAME}" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++ ${PTHREAD_LIBS}" \
-		LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++ ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	MOC="${MOC}" LIBQT="-lqt2" \
+		CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \
+		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++"
 USE_GMAKE=	yes
 MAKE_ENV=	SOMAJOR="${SOMAJOR}" SOMINOR="${SOMINOR}"
 PLIST_SUB+=	LIBVER="${SOMAJOR}"
 
+.include <bsd.port.pre.mk>
+
 pre-fetch:
 .if ${OSVERSION} <= 410002
 	@${ECHO}
@@ -74,15 +52,9 @@ pre-fetch:
 .endif
 
 pre-configure:
-.for NUM in 1 3
-	(find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
-		"s@version-info ${NUM}:0@version-info ${SOMAJOR}:${SOMINOR}@g")
-.endfor
-
-post-configure:
-	@${CP} ${WRKSRC}/libtool ${WRKSRC}/libtool.orig
-	${SED} -e 's@\\\$$compiler_flags@\\\$$compiler_flags ${PTHREAD_LIBS}@g' ${WRKSRC}/libtool.orig \
-		> ${WRKSRC}/libtool
+	(find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi.orig -e \
+		"s@version-info 1:0@version-info ${SOMAJOR}:${SOMINOR}@g; \
+		 s@version-info 3:0@version-info ${SOMAJOR}:${SOMINOR}@g")
 
 post-install:
 .for LIB in DCOP kab kdecore kdesu kdeui kfile kformula kio kjs \
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 08b63213a6bd..170ff7b40d45 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -27,40 +27,18 @@ USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 
-.include <bsd.port.pre.mk>
-
-# Hack to make pthread support work correctly.
-.if exists(${X11BASE}/lib/libqt2-mt.so)
-.if exists(${X11BASE}/lib/libXThrStub.so)
-QTNAME=		qt2-mt
-.if ${OSVERSION} >= 500016
-PTHREAD_CFLAGS=
-PTHREAD_LIBS=	-lc_r
-.else
-PTHREAD_CFLAGS=	-D_THREAD_SAFE
-PTHREAD_LIBS=	-pthread
-.endif
-.else
-QTNAME=		qt2
-PTHREAD_CFLAGS=
-PTHREAD_LIBS=
-.endif
-.endif
-
-CFLAGS+=	${PTHREAD_CFLAGS} ${PTHREAD_LIBS}
-LDFLAGS+=	${PTHREAD_LIBS}
-
 CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 		--with-qt-libraries=${X11BASE}/lib \
 		--with-extra-libs=${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \
-		MOC="${MOC}" LIBQT="-l${QTNAME}" LIBQTFILE="lib${QTNAME}" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++ ${PTHREAD_LIBS}" \
-		LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++ ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	MOC="${MOC}" LIBQT="-lqt2" \
+		CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \
+		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++"
 USE_GMAKE=	yes
 MAKE_ENV=	SOMAJOR="${SOMAJOR}" SOMINOR="${SOMINOR}"
 PLIST_SUB+=	LIBVER="${SOMAJOR}"
 
+.include <bsd.port.pre.mk>
+
 pre-fetch:
 .if ${OSVERSION} <= 410002
 	@${ECHO}
@@ -74,15 +52,9 @@ pre-fetch:
 .endif
 
 pre-configure:
-.for NUM in 1 3
-	(find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
-		"s@version-info ${NUM}:0@version-info ${SOMAJOR}:${SOMINOR}@g")
-.endfor
-
-post-configure:
-	@${CP} ${WRKSRC}/libtool ${WRKSRC}/libtool.orig
-	${SED} -e 's@\\\$$compiler_flags@\\\$$compiler_flags ${PTHREAD_LIBS}@g' ${WRKSRC}/libtool.orig \
-		> ${WRKSRC}/libtool
+	(find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi.orig -e \
+		"s@version-info 1:0@version-info ${SOMAJOR}:${SOMINOR}@g; \
+		 s@version-info 3:0@version-info ${SOMAJOR}:${SOMINOR}@g")
 
 post-install:
 .for LIB in DCOP kab kdecore kdesu kdeui kfile kformula kio kjs \
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 08b63213a6bd..170ff7b40d45 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -27,40 +27,18 @@ USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 
-.include <bsd.port.pre.mk>
-
-# Hack to make pthread support work correctly.
-.if exists(${X11BASE}/lib/libqt2-mt.so)
-.if exists(${X11BASE}/lib/libXThrStub.so)
-QTNAME=		qt2-mt
-.if ${OSVERSION} >= 500016
-PTHREAD_CFLAGS=
-PTHREAD_LIBS=	-lc_r
-.else
-PTHREAD_CFLAGS=	-D_THREAD_SAFE
-PTHREAD_LIBS=	-pthread
-.endif
-.else
-QTNAME=		qt2
-PTHREAD_CFLAGS=
-PTHREAD_LIBS=
-.endif
-.endif
-
-CFLAGS+=	${PTHREAD_CFLAGS} ${PTHREAD_LIBS}
-LDFLAGS+=	${PTHREAD_LIBS}
-
 CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 		--with-qt-libraries=${X11BASE}/lib \
 		--with-extra-libs=${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H ${PTHREAD_CFLAGS}" \
-		MOC="${MOC}" LIBQT="-l${QTNAME}" LIBQTFILE="lib${QTNAME}" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++ ${PTHREAD_LIBS}" \
-		LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++ ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	MOC="${MOC}" LIBQT="-lqt2" \
+		CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \
+		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++"
 USE_GMAKE=	yes
 MAKE_ENV=	SOMAJOR="${SOMAJOR}" SOMINOR="${SOMINOR}"
 PLIST_SUB+=	LIBVER="${SOMAJOR}"
 
+.include <bsd.port.pre.mk>
+
 pre-fetch:
 .if ${OSVERSION} <= 410002
 	@${ECHO}
@@ -74,15 +52,9 @@ pre-fetch:
 .endif
 
 pre-configure:
-.for NUM in 1 3
-	(find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
-		"s@version-info ${NUM}:0@version-info ${SOMAJOR}:${SOMINOR}@g")
-.endfor
-
-post-configure:
-	@${CP} ${WRKSRC}/libtool ${WRKSRC}/libtool.orig
-	${SED} -e 's@\\\$$compiler_flags@\\\$$compiler_flags ${PTHREAD_LIBS}@g' ${WRKSRC}/libtool.orig \
-		> ${WRKSRC}/libtool
+	(find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi.orig -e \
+		"s@version-info 1:0@version-info ${SOMAJOR}:${SOMINOR}@g; \
+		 s@version-info 3:0@version-info ${SOMAJOR}:${SOMINOR}@g")
 
 post-install:
 .for LIB in DCOP kab kdecore kdesu kdeui kfile kformula kio kjs \