Overhaul QT/KDE support:

- bsd.port.mk update to use bsd.kde.mk for USE_{QT,KDE}* - Cleanup corresponding ports for bsd.kde.mk update. - Fix bsd.kde.mk: use correct kdelibs dependency, put qt at the bottom, introduce QT_NONSTANDARD variable for nonstandard configure setup. - Update KDE2 to 2.1.1. Two patches included in x11/kdelibs2 to fix the proxy authentication that was broken for 2.1.1. Remove old patches. - Potentially fix kdelibs build for alpha. - Fix qt-designer 2.3.0 build. - Ruby stuff left alone since it looks like black magic to me. Should still work w/ compat shims for older USE_QT[,2] style. Some others were also left alone for the same reason. Reviewed by: portmgr, ports (bsd.kde.mk+bsd.port.mk) Submitted by: David Faure <faure@kde.org> (proxy auth patches) Alex Zepeda <garbanzo@kde.org> (old patches removal)
svn path=/head/; revision=40792
2025-01-10 07:04:03 +00:00 · 2001-04-03 08:14:43 +00:00 · 2001-04-03 08:14:43 +00:00 · dbba8af644 · 2021-03-31 03:12:20 +00:00
commit dbba8af644
parent 683eaaa4ff
293 changed files with 708 additions and 1284 deletions
--- a/Mk/bsd.kde.mk
+++ b/Mk/bsd.kde.mk
@ -34,51 +34,18 @@ pre-everything::
 	@${ECHO} ">>> Warning:  this port needs to be updated as it uses the old-style USE_QT2 variable!"
 .endif

-# USE_QT_VER section
-.if defined(USE_QT_VER)
-
-# Qt 1.x common stuff
-.if ${USE_QT_VER} == 1
-LIB_DEPENDS+=	qt.3:${PORTSDIR}/x11-toolkits/qt145
-USE_NEWGCC=		yes
-MOC?=			${X11BASE}/bin/moc
-.if defined(PREFIX)
-QTDIR=			${PREFIX}
-.else
-QTDIR=			${X11BASE}
-.endif
-CONFIGURE_ENV+=	MOC="${MOC}" QTDIR="${QTDIR}"
-
-.else
-
-# Qt 2.x common stuff -- DEFAULT
-LIB_DEPENDS+=	qt2.4:${PORTSDIR}/x11-toolkits/qt23
-USE_NEWGCC=		yes
-QTNAME=			qt2
-MOC?=			${X11BASE}/bin/moc2
-CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
-				--with-qt-libraries=${X11BASE}/lib \
-				--with-extra-libs=${LOCALBASE}/lib
-QTCPPFLAGS=		-I/usr/include -D_GETOPT_H -D_PTH_H_ -D_PTH_PTHREAD_H_ -I${LOCALBASE}/include -I${PREFIX}/include
-QTCFGLIBS=		-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++
-CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-l${QTNAME}" \
-				CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}"
-.endif
-.endif
-# End of USE_QT_VER section
-
 # USE_KDELIBS_VER section
 .if defined(USE_KDELIBS_VER)

 # kdelibs 1.x common stuff 
 .if ${USE_KDELIBS_VER} == 1
-LIB_DEPENDS+=	kdelibs.3:${PORTSDIR}/x11/kdelibs11
+LIB_DEPENDS+=	kdecore.3:${PORTSDIR}/x11/kdelibs11
 USE_QT_VER=		1

 .else

 # kdelibs 2.x common stuff -- DEFAULT
-LIB_DEPENDS+=	kdelibs.4:${PORTSDIR}/x11/kdelibs2
+LIB_DEPENDS+=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 USE_QT_VER=		2

 .endif
@ -103,4 +70,43 @@ USE_KDELIBS_VER=2
 .endif
 # End of USE_KDEBASE_VER

+# USE_QT_VER section
+.if defined(USE_QT_VER)
+
+# Qt 1.x common stuff
+.if ${USE_QT_VER} == 1
+LIB_DEPENDS+=	qt.3:${PORTSDIR}/x11-toolkits/qt145
+USE_NEWGCC=		yes
+MOC?=			${X11BASE}/bin/moc
+.if defined(PREFIX)
+QTDIR=			${PREFIX}
+.else
+QTDIR=			${X11BASE}
+.endif
+CONFIGURE_ENV+=	MOC="${MOC}" QTDIR="${QTDIR}"
+
+.else
+
+QTCPPFLAGS?=
+QTCFLIBS?=
+
+# Qt 2.x common stuff -- DEFAULT
+LIB_DEPENDS+=	qt2.4:${PORTSDIR}/x11-toolkits/qt23
+USE_NEWGCC=		yes
+QTNAME=			qt2
+MOC?=			${X11BASE}/bin/moc2
+QTCPPFLAGS+=	-I/usr/include -D_GETOPT_H -D_PTH_H_ -D_PTH_PTHREAD_H_ \
+				-I${LOCALBASE}/include -I${PREFIX}/include -I${X11BASE}/include/qt2
+QTCFGLIBS+=		-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -ljpeg -lgcc -lstdc++
+.if !defined(QT_NONSTANDARD)
+CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
+				--with-qt-libraries=${X11BASE}/lib \
+				--with-extra-libs=${LOCALBASE}/lib
+CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-l${QTNAME}" \
+				CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}"
+.endif
+.endif
+.endif
+# End of USE_QT_VER section
+
 # End of use part.
--- a/Mk/bsd.kde4.mk
+++ b/Mk/bsd.kde4.mk
@ -34,51 +34,18 @@ pre-everything::
 	@${ECHO} ">>> Warning:  this port needs to be updated as it uses the old-style USE_QT2 variable!"
 .endif

-# USE_QT_VER section
-.if defined(USE_QT_VER)
-
-# Qt 1.x common stuff
-.if ${USE_QT_VER} == 1
-LIB_DEPENDS+=	qt.3:${PORTSDIR}/x11-toolkits/qt145
-USE_NEWGCC=		yes
-MOC?=			${X11BASE}/bin/moc
-.if defined(PREFIX)
-QTDIR=			${PREFIX}
-.else
-QTDIR=			${X11BASE}
-.endif
-CONFIGURE_ENV+=	MOC="${MOC}" QTDIR="${QTDIR}"
-
-.else
-
-# Qt 2.x common stuff -- DEFAULT
-LIB_DEPENDS+=	qt2.4:${PORTSDIR}/x11-toolkits/qt23
-USE_NEWGCC=		yes
-QTNAME=			qt2
-MOC?=			${X11BASE}/bin/moc2
-CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
-				--with-qt-libraries=${X11BASE}/lib \
-				--with-extra-libs=${LOCALBASE}/lib
-QTCPPFLAGS=		-I/usr/include -D_GETOPT_H -D_PTH_H_ -D_PTH_PTHREAD_H_ -I${LOCALBASE}/include -I${PREFIX}/include
-QTCFGLIBS=		-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++
-CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-l${QTNAME}" \
-				CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}"
-.endif
-.endif
-# End of USE_QT_VER section
-
 # USE_KDELIBS_VER section
 .if defined(USE_KDELIBS_VER)

 # kdelibs 1.x common stuff 
 .if ${USE_KDELIBS_VER} == 1
-LIB_DEPENDS+=	kdelibs.3:${PORTSDIR}/x11/kdelibs11
+LIB_DEPENDS+=	kdecore.3:${PORTSDIR}/x11/kdelibs11
 USE_QT_VER=		1

 .else

 # kdelibs 2.x common stuff -- DEFAULT
-LIB_DEPENDS+=	kdelibs.4:${PORTSDIR}/x11/kdelibs2
+LIB_DEPENDS+=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 USE_QT_VER=		2

 .endif
@ -103,4 +70,43 @@ USE_KDELIBS_VER=2
 .endif
 # End of USE_KDEBASE_VER

+# USE_QT_VER section
+.if defined(USE_QT_VER)
+
+# Qt 1.x common stuff
+.if ${USE_QT_VER} == 1
+LIB_DEPENDS+=	qt.3:${PORTSDIR}/x11-toolkits/qt145
+USE_NEWGCC=		yes
+MOC?=			${X11BASE}/bin/moc
+.if defined(PREFIX)
+QTDIR=			${PREFIX}
+.else
+QTDIR=			${X11BASE}
+.endif
+CONFIGURE_ENV+=	MOC="${MOC}" QTDIR="${QTDIR}"
+
+.else
+
+QTCPPFLAGS?=
+QTCFLIBS?=
+
+# Qt 2.x common stuff -- DEFAULT
+LIB_DEPENDS+=	qt2.4:${PORTSDIR}/x11-toolkits/qt23
+USE_NEWGCC=		yes
+QTNAME=			qt2
+MOC?=			${X11BASE}/bin/moc2
+QTCPPFLAGS+=	-I/usr/include -D_GETOPT_H -D_PTH_H_ -D_PTH_PTHREAD_H_ \
+				-I${LOCALBASE}/include -I${PREFIX}/include -I${X11BASE}/include/qt2
+QTCFGLIBS+=		-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -ljpeg -lgcc -lstdc++
+.if !defined(QT_NONSTANDARD)
+CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
+				--with-qt-libraries=${X11BASE}/lib \
+				--with-extra-libs=${LOCALBASE}/lib
+CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-l${QTNAME}" \
+				CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}"
+.endif
+.endif
+.endif
+# End of USE_QT_VER section
+
 # End of use part.
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@ -170,10 +170,6 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 #						target.
 # USE_X_PREFIX	- Says that the port installs in ${X11BASE}.  Implies USE_XLIB.
 # USE_XLIB		- Says that the port uses X libraries.
-# USE_QT		- Says that the port uses version 1 of the qt toolkit.
-#				  Implies USE_NEWGCC.
-# USE_QT2		- Says that the port uses version 2 of the qt toolkit.
-#				  Implies USE_NEWGCC.
 # USE_MOTIF		- Says that the port uses the Motif toolkit.  Implies USE_XPM.
 #
 # Dependency checking.  Use these if your port requires another port
@ -764,16 +760,6 @@ MANCOMPRESSED?=	yes
 MANCOMPRESSED?=	no
 .endif

-.if defined(USE_QT)
-LIB_DEPENDS+=	qt.3:${PORTSDIR}/x11-toolkits/qt145
-USE_NEWGCC=	yes
-.endif
-
-.if defined(USE_QT2)
-LIB_DEPENDS+=	qt2.4:${PORTSDIR}/x11-toolkits/qt23
-USE_NEWGCC=	yes
-.endif
-
 .if defined(USE_BZIP2)
 BUILD_DEPENDS+=		bzip2:${PORTSDIR}/archivers/bzip2
 .endif
@ -904,6 +890,10 @@ LIB_DEPENDS+=	X11.6:${PORTSDIR}/x11/XFree86-4-libraries
 .endif
 .endif

+.if defined(USE_QT) || defined(USE_QT2) || defined(USE_QT_VER) || defined(USE_KDELIBS_VER) || defined(USE_KDEBASE_VER)
+.include "${PORTSDIR}/Mk/bsd.kde.mk"
+.endif
+
 .include "${PORTSDIR}/Mk/bsd.gnome.mk"

 .if exists(${PORTSDIR}/../Makefile.inc)
--- a/arabic/kde3-i18n/Makefile
+++ b/arabic/kde3-i18n/Makefile
@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src

 MAINTAINER=	demon@FreeBSD.org

-LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2 \
-		intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext

+USE_KDELIBS_VER=2
 USE_BZIP2=	yes
 USE_GMAKE=	yes

--- a/arabic/kde4-l10n/Makefile
+++ b/arabic/kde4-l10n/Makefile
@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src

 MAINTAINER=	demon@FreeBSD.org

-LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2 \
-		intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext

+USE_KDELIBS_VER=2
 USE_BZIP2=	yes
 USE_GMAKE=	yes

--- a/archivers/ark/Makefile
+++ b/archivers/ark/Makefile
@ -6,27 +6,17 @@
 #

 PORTNAME=	kdeutils
-PORTVERSION=	2.1
+PORTVERSION=	2.1.1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src

 MAINTAINER=	will@FreeBSD.org

-LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
-
-USE_QT2=	yes
-MOC?=		${X11BASE}/bin/moc2
+USE_KDELIBS_VER=2
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
-		--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib
-CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
-		CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \
-		USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc"
 USE_GMAKE=	yes

 .include <bsd.port.mk>
--- a/archivers/ark/distinfo
+++ b/archivers/ark/distinfo
@ -1 +1 @@
-MD5 (kdeutils-2.1.tar.bz2) = 52454f2357be364203146caedc122f5a
+MD5 (kdeutils-2.1.1.tar.bz2) = 1ba82d34688b0959072ce05182a27e23
--- a/astro/xglobe/Makefile
+++ b/astro/xglobe/Makefile
@ -12,7 +12,7 @@ MASTER_SITES=	http://www.uni-karlsruhe.de/~uddn/xglobe/

 MAINTAINER=	kris@FreeBSD.org

-USE_QT=		yes
+USE_QT_VER=	1
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes

--- a/audio/kdemultimedia2/Makefile
+++ b/audio/kdemultimedia2/Makefile
@ -6,7 +6,7 @@
 #

 PORTNAME=	kdemultimedia
-PORTVERSION=	2.1
+PORTVERSION=	2.1.1
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
@ -14,18 +14,13 @@ MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 MAINTAINER=	will@FreeBSD.org

 RUN_DEPENDS=	xanim:${PORTSDIR}/graphics/xanim
-LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2

-USE_QT2=	yes
-MOC?=		${X11BASE}/bin/moc2
+USE_KDELIBS_VER=2
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 USE_AUTOCONF=	yes
 CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 		--with-qt-libraries=${X11BASE}/lib
-CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" \
-		CPPFLAGS="-I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_ -D_GETOPT_H -D_XOPEN_UNIX -I${LOCALBASE}/include" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc"
 USE_GMAKE=	yes

 pre-configure:
--- a/audio/kdemultimedia2/distinfo
+++ b/audio/kdemultimedia2/distinfo
@ -1 +1 @@
-MD5 (kdemultimedia-2.1.tar.bz2) = 163e76221c417c5288e289ba9c2cba0f
+MD5 (kdemultimedia-2.1.1.tar.bz2) = f33bcc843c181885da6799a1e80ca294
--- a/audio/kdemultimedia3/Makefile
+++ b/audio/kdemultimedia3/Makefile
@ -6,7 +6,7 @@
 #

 PORTNAME=	kdemultimedia
-PORTVERSION=	2.1
+PORTVERSION=	2.1.1
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
@ -14,18 +14,13 @@ MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 MAINTAINER=	will@FreeBSD.org

 RUN_DEPENDS=	xanim:${PORTSDIR}/graphics/xanim
-LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2

-USE_QT2=	yes
-MOC?=		${X11BASE}/bin/moc2
+USE_KDELIBS_VER=2
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 USE_AUTOCONF=	yes
 CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
 		--with-qt-libraries=${X11BASE}/lib
-CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" \
-		CPPFLAGS="-I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_ -D_GETOPT_H -D_XOPEN_UNIX -I${LOCALBASE}/include" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc"
 USE_GMAKE=	yes

 pre-configure:
--- a/audio/kdemultimedia3/distinfo
+++ b/audio/kdemultimedia3/distinfo
@ -1 +1 @@
-MD5 (kdemultimedia-2.1.tar.bz2) = 163e76221c417c5288e289ba9c2cba0f
+MD5 (kdemultimedia-2.1.1.tar.bz2) = f33bcc843c181885da6799a1e80ca294
--- a/audio/kmikmod/Makefile
+++ b/audio/kmikmod/Makefile
@ -19,7 +19,7 @@ LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11 \

 USE_BZIP2=	yes
 WRKSRC=		${WRKDIR}/kmikmod
-USE_QT=		yes
+USE_QT_VER=	1
 USE_GMAKE=	yes
 WANT_ESOUND=	yes
 USE_LIBTOOL=	yes
--- a/audio/kmp3/Makefile
+++ b/audio/kmp3/Makefile
@ -12,10 +12,7 @@ MASTER_SITES=	http://www.kmp3.org/tarballs/

 MAINTAINER=	mb@imp.ch

-LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11 \
-		QwSpriteField.7:${PORTSDIR}/converters/kdesupport11
-
-USE_QT=		yes
+USE_KDELIBS_VER=1
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/kmp3
--- a/audio/kmpg/Makefile
+++ b/audio/kmpg/Makefile
@ -13,10 +13,7 @@ MASTER_SITE_SUBDIR=	tom

 MAINTAINER=	tom@FreeBSD.org

-LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11 \
-		kdeui.3:${PORTSDIR}/x11/kdelibs11
-
-USE_QT=		yes
+USE_KDELIBS_VER=1
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes

--- a/audio/knapster/Makefile
+++ b/audio/knapster/Makefile
@ -14,11 +14,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}

 MAINTAINER=	jedgar@FreeBSD.org

-LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11
-RUN_DEPENDS=	kdehelp:${PORTSDIR}/x11/kdebase11
-
+USE_KDEBASE_VER=1
 USE_AUTOCONF=	yes
 USE_GMAKE=	yes
-USE_QT=		yes

 .include <bsd.port.mk>
--- a/audio/krio/Makefile
+++ b/audio/krio/Makefile
@ -14,17 +14,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}

 MAINTAINER=	ak@freenet.co.uk

-LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11 \
-		kdeui.3:${PORTSDIR}/x11/kdelibs11 \
-		kfm.3:${PORTSDIR}/x11/kdelibs11 \
-		kfile.3:${PORTSDIR}/x11/kdelibs11
-RUN_DEPENDS=	kdehelp:${PORTSDIR}/x11/kdebase11
-
-USE_QT=		yes
+USE_KDEBASE_VER=1
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-qt-includes=${QTDIR}/include/X11/qt" \
-		"--with-extra-includes=${LOCALBASE}/include" \
-		"--with-extra-libs=${LOCALBASE}/lib"
+CONFIGURE_ARGS= --with-extra-includes=${LOCALBASE}/include

 .include <bsd.port.mk>
--- a/audio/mq3/Makefile
+++ b/audio/mq3/Makefile
@ -16,14 +16,13 @@ LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw \
 		vorbis.0:${PORTSDIR}/audio/libvorbis
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm

-USE_QT2=	yes
-
+USE_QT_VER=	2
+QT_NONSTANDARD=	yes
 HAS_CONFIGURE=	yes
 MAKE_ENV=	CPPFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib}" \
 		INCDIR_QT="${X11BASE}/include/qt2" \
 		LIBDIR_QT="${X11BASE}/lib" \
 		QTDIR="${X11BASE}"
-
 CONFIGURE_ARGS=	-prefix ${PREFIX} -platform FreeBSD

 .include <bsd.port.mk>
--- a/audio/musicbox/Makefile
+++ b/audio/musicbox/Makefile
@ -16,8 +16,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	trevor@FreeBSD.org

 RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
-LIB_DEPENDS=	qt.3:${PORTSDIR}/x11-toolkits/qt145

+USE_QT_VER=	1
 DOCS=		ChangeLog README
 EVAL_PREFIX+=	QT1DIR=qt
 PATH=		${QT1DIR}/qt/bin:$$PATH
--- a/audio/xamp/Makefile
+++ b/audio/xamp/Makefile
@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 USE_GMAKE=	YES
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.8/${PORTNAME}-0.8g/
 DIST_SUBDIR=	xamp
-USE_QT=		yes
+USE_QT_VER=	1
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
--- a/audio/xsidplay/Makefile
+++ b/audio/xsidplay/Makefile
@ -18,16 +18,11 @@ LIB_DEPENDS=	sidplay.1:${PORTSDIR}/audio/libsidplay

 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

-USE_QT2=	yes
+USE_QT_VER=	2
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ENV=	MOC="${X11BASE}/bin/moc2"
-CONFIGURE_ARGS=	--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib \
-		--with-sidplay-inc=${LOCALBASE}/include \
-		--with-sidplay-lib=${LOCALBASE}/lib \
-		--with-x-includes=${X11BASE}/include \
-		--with-x-libraries=${X11BASE}/lib
+CONFIGURE_ARGS+=--with-sidplay-inc=${LOCALBASE}/include \
+		--with-sidplay-lib=${LOCALBASE}/lib

 CFLAGS+=	${PTHREAD_CFLAGS}

--- a/biology/xdrawchem/Makefile
+++ b/biology/xdrawchem/Makefile
@ -16,8 +16,7 @@ MAINTAINER=	trevor@FreeBSD.org
 MAKE_ENV=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" QTDIR="${X11BASE}"
 PLIST=		${WRKDIR}/pkg-plist
 USE_GMAKE=	yes
-USE_NEWGCC=	yes
-USE_QT2=	yes
+USE_QT_VER=	2
 USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/a//}

--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	ports@FreeBSD.org

 USE_XLIB=	yes
-USE_QT2=	yes
+USE_QT_VER=	2
 MAKE_ENV=	QTDIR="${X11BASE}"

 .include <bsd.port.pre.mk>
--- a/cad/qcad2/Makefile
+++ b/cad/qcad2/Makefile
@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	ports@FreeBSD.org

 USE_XLIB=	yes
-USE_QT2=	yes
+USE_QT_VER=	2
 MAKE_ENV=	QTDIR="${X11BASE}"

 .include <bsd.port.pre.mk>
--- a/comms/kremotecontrol/Makefile
+++ b/comms/kremotecontrol/Makefile
@ -6,27 +6,17 @@
 #

 PORTNAME=	kdeutils
-PORTVERSION=	2.1
+PORTVERSION=	2.1.1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src

 MAINTAINER=	will@FreeBSD.org

-LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
-
-USE_QT2=	yes
-MOC?=		${X11BASE}/bin/moc2
+USE_KDELIBS_VER=2
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
-		--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib
-CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
-		CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \
-		USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc"
 USE_GMAKE=	yes

 .include <bsd.port.mk>
--- a/comms/kremotecontrol/distinfo
+++ b/comms/kremotecontrol/distinfo
@ -1 +1 @@
-MD5 (kdeutils-2.1.tar.bz2) = 52454f2357be364203146caedc122f5a
+MD5 (kdeutils-2.1.1.tar.bz2) = 1ba82d34688b0959072ce05182a27e23
--- a/converters/kdesupport11/Makefile
+++ b/converters/kdesupport11/Makefile
@ -18,19 +18,12 @@ MAINTAINER=	will@FreeBSD.org
 USE_BZIP2=	yes

 NO_LATEST_LINK=	yes
-USE_QT=		yes
+USE_QT_VER=	1
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--without-libjpeg --without-libgif \
 		--without-libgdbm --without-libuulib \
 		--with-qt-includes=${QTDIR}/include/X11/qt
-CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" INSTALL_SCRIPT="install -c -m 555" \
-		QTDIR=${QTDIR}
-
-.if defined(PREFIX)
-QTDIR?=		${PREFIX}
-.else
-QTDIR?=		${X11BASE}
-.endif
+CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" INSTALL_SCRIPT="install -c -m 555"

 .include <bsd.port.mk>
--- a/converters/kdesupport2/Makefile
+++ b/converters/kdesupport2/Makefile
@ -16,21 +16,13 @@ MAINTAINER=	will@FreeBSD.org
 LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg

-USE_QT2=	yes
-MOC?=		${X11BASE}/bin/moc2
+USE_QT_VER=	2
 USE_BZIP2=	yes
-USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes

-CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib \
-		--with-extra-libs=${LOCALBASE}/lib \
-		--without-audiofile
-CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" \
-		CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc"
+CONFIGURE_ARGS+=--without-audiofile

 pre-configure:
 	${PERL} -pi -e "s@-version-info 1:1@-version-info 3:0@g" ${WRKSRC}/mimelib/Makefile.in
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@ -6,27 +6,17 @@
 #

 PORTNAME=	kdeutils
-PORTVERSION=	2.1
+PORTVERSION=	2.1.1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src

 MAINTAINER=	will@FreeBSD.org

-LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
-
-USE_QT2=	yes
-MOC?=		${X11BASE}/bin/moc2
+USE_KDELIBS_VER=2
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
-		--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib
-CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
-		CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \
-		USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc"
 USE_GMAKE=	yes

 .include <bsd.port.mk>
--- a/deskutils/kcharselect/distinfo
+++ b/deskutils/kcharselect/distinfo
@ -1 +1 @@
-MD5 (kdeutils-2.1.tar.bz2) = 52454f2357be364203146caedc122f5a
+MD5 (kdeutils-2.1.1.tar.bz2) = 1ba82d34688b0959072ce05182a27e23
--- a/deskutils/kdepim/Makefile
+++ b/deskutils/kdepim/Makefile
@ -13,20 +13,11 @@ MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src

 MAINTAINER=	demon@FreeBSD.org

-LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
-
+USE_KDELIBS_VER=2
 USE_BISON=	yes
-USE_QT2=	yes
-MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-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" \
-		MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++"
 USE_GMAKE=	yes

 .include <bsd.port.mk>
--- a/deskutils/kdepim3/Makefile
+++ b/deskutils/kdepim3/Makefile
@ -13,20 +13,11 @@ MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src

 MAINTAINER=	demon@FreeBSD.org

-LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
-
+USE_KDELIBS_VER=2
 USE_BISON=	yes
-USE_QT2=	yes
-MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-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" \
-		MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++"
 USE_GMAKE=	yes

 .include <bsd.port.mk>
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@ -13,20 +13,11 @@ MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src

 MAINTAINER=	demon@FreeBSD.org

-LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
-
+USE_KDELIBS_VER=2
 USE_BISON=	yes
-USE_QT2=	yes
-MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-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" \
-		MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++"
 USE_GMAKE=	yes

 .include <bsd.port.mk>
--- a/deskutils/kdepim44/Makefile
+++ b/deskutils/kdepim44/Makefile
@ -13,20 +13,11 @@ MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src

 MAINTAINER=	demon@FreeBSD.org

-LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
-
+USE_KDELIBS_VER=2
 USE_BISON=	yes
-USE_QT2=	yes
-MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-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" \
-		MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++"
 USE_GMAKE=	yes

 .include <bsd.port.mk>
--- a/deskutils/korganizer/Makefile
+++ b/deskutils/korganizer/Makefile
@ -11,20 +11,15 @@ CATEGORIES=	deskutils kde
 MASTER_SITES=	$(MASTER_SITE_KDE)
 MASTER_SITE_SUBDIR=	stable/1.1.2/distribution/tar/generic/source/bz2

-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		kdecore.3:${PORTSDIR}/x11/kdelibs11 \
-		kdeui.3:${PORTSDIR}/x11/kdelibs11
-
+USE_KDELIBS_VER=1
 USE_BZIP2=	yes
-USE_QT=		yes
 HAS_CONFIGURE=	yes
 USE_BISON=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"

 pre-configure:
-		${RM} -rf -- $(WRKSRC)/src/.deps $(WRKSRC)/config.cache
+	${RM} -rf -- $(WRKSRC)/src/.deps $(WRKSRC)/config.cache

 .include <bsd.port.mk>
--- a/deskutils/kproject/Makefile
+++ b/deskutils/kproject/Makefile
@ -13,10 +13,8 @@ MASTER_SITE_SUBDIR= unstable/apps/office
 EXTRACT_SUFX=	.tgz

 BUILD_DEPENDS=	libtool:${PORTSDIR}/devel/libtool
-LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11 \
-		kdeui.3:${PORTSDIR}/x11/kdelibs11

-USE_QT=		yes
+USE_KDELIBS_VER=1
 WRKSRC=		${WRKDIR}/kproject

 .include <bsd.port.mk>
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@ -13,7 +13,7 @@ EXTRACT_SUFX=	.src.tar.gz

 MAINTAINER=	joep@di.nl

-USE_QT=		yes
+USE_QT_VER=	1
 USE_PERL5=	yes
 MAKE_ENV+=	QTDIR="${X11BASE}" PCFLAGS="${CFLAGS}" PCXXFLAGS="${CXXFLAGS}"
 HAS_CONFIGURE=	yes
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@ -14,10 +14,8 @@ MASTER_SITE_SUBDIR= kdbg/
 MAINTAINER=	jedgar@FreeBSD.org

 BUILD_DEPENDS=	libtool:${PORTSDIR}/devel/libtool
-LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11
-RUN_DEPENDS=	kdehelp:${PORTSDIR}/x11/kdebase11

+USE_KDEBASE_VER=1
 GNU_CONFIGURE=	yes
-USE_QT=		yes

 .include <bsd.port.mk>
--- a/devel/kdelibdocs/Makefile
+++ b/devel/kdelibdocs/Makefile
@ -14,11 +14,9 @@ MASTER_SITES=	ftp://129.187.206.68/pub/unix/ide/KDevelop/documentation/ \

 MAINTAINER=	ports@FreeBSD.org

-LIB_DEPENDS?=	kdecore.3:${PORTSDIR}/x11/kdelibs11
-
+USE_KDELIBS_VER=1
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--with-qtdoc-dir=${X11BASE}/share/doc/qt/html" \
-		"--with-qt-includes=${X11BASE}/include/X11/qt"
+CONFIGURE_ARGS=	"--with-qtdoc-dir=${X11BASE}/share/doc/qt/html"

 .include <bsd.port.mk>
--- a/devel/kdesdk/Makefile
+++ b/devel/kdesdk/Makefile
@ -13,19 +13,10 @@ MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src

 MAINTAINER=	demon@FreeBSD.org

-LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
-
-USE_QT2=	yes
-MOC?=		${X11BASE}/bin/moc2
+USE_KDELIBS_VER=2
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-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" \
-		MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++"
 USE_GMAKE=	yes

 MAN1=		cvs2pack.1 cvschanged.1 cvsversion.1 noncvslist.1 kde-build.1
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@ -13,19 +13,10 @@ MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src

 MAINTAINER=	demon@FreeBSD.org

-LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
-
-USE_QT2=	yes
-MOC?=		${X11BASE}/bin/moc2
+USE_KDELIBS_VER=2
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-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" \
-		MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++"
 USE_GMAKE=	yes

 MAN1=		cvs2pack.1 cvschanged.1 cvsversion.1 noncvslist.1 kde-build.1
--- a/devel/kdesdk4/Makefile
+++ b/devel/kdesdk4/Makefile
@ -13,19 +13,10 @@ MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src

 MAINTAINER=	demon@FreeBSD.org

-LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
-
-USE_QT2=	yes
-MOC?=		${X11BASE}/bin/moc2
+USE_KDELIBS_VER=2
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-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" \
-		MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++"
 USE_GMAKE=	yes

 MAN1=		cvs2pack.1 cvschanged.1 cvsversion.1 noncvslist.1 kde-build.1
--- a/devel/kdestudio/Makefile
+++ b/devel/kdestudio/Makefile
@ -13,19 +13,10 @@ MASTER_SITES=	ftp://ftp.thekompany.com/pub/KDE_Studio/source/ \

 MAINTAINER=	twschulz@cord.edu

-LIB_DEPENDS=	kdeui.4:${PORTSDIR}/x11/kdelibs2
-
-USE_QT2=	yes
-MOC?=		${X11BASE}/bin/moc2
+USE_KDELIBS_VER=2
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-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" \
-		MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++"

 pre-configure:
 	@/usr/bin/find ${WRKSRC} -name Makefile.in | /usr/bin/xargs ${PERL} -pi -e "s/CXXFLAGS = -O2 -Wall/#CXXFLAGS = do not touch me/"
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@ -6,16 +6,14 @@
 #

 PORTNAME=	kdevelop
-PORTVERSION=	1.4
-PORTREVISION=	1
+PORTVERSION=	1.4.1
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/2.1/distribution/tar/generic/src
+MASTER_SITE_SUBDIR=	stable/2.1.1/distribution/tar/generic/src

 MAINTAINER=	demon@FreeBSD.org

 BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
-LIB_DEPENDS=	kdeui.4:${PORTSDIR}/x11/kdelibs2
 RUN_DEPENDS=	gmake:${PORTSDIR}/devel/gmake
 .if defined(WITH_OPTIONAL_DEPENDS)
 RUN_DEPENDS+=	autoconf:${PORTSDIR}/devel/autoconf \
@ -32,19 +30,12 @@ RUN_DEPENDS+=	autoconf:${PORTSDIR}/devel/autoconf \
 		a2ps:${PORTSDIR}/print/a2ps43-letter
 .endif

+USE_KDELIBS_VER=2
 USE_BZIP2=	yes
-USE_QT2=	yes
-MOC?=		${X11BASE}/bin/moc2
 USE_GMAKE=	yes
 USE_AUTOCONF=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib \
-		--with-qtdoc-dir=${X11BASE}/share/doc/qt2/html \
-		--with-extra-libs=${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \
-		MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++"
+CONFIGURE_ARGS+= --with-qtdoc-dir=${X11BASE}/share/doc/qt2/html

 pre-everything::
 .if !defined(WITH_OPTIONAL_DEPENDS)
--- a/devel/kdevelop/distinfo
+++ b/devel/kdevelop/distinfo
@ -1 +1 @@
-MD5 (kdevelop-1.4.tar.bz2) = d5f2b10a390bb888654b85b29bd3f07e
+MD5 (kdevelop-1.4.1.tar.bz2) = 7e7bf0bb436c5d868e068291b2176208
--- a/devel/kpp/Makefile
+++ b/devel/kpp/Makefile
@ -12,10 +12,8 @@ MASTER_SITES=	http://www.msoe.edu/~geiseri/files/

 MAINTAINER=	ports@FreeBSD.org

-LIB_DEPENDS=	kdeui.3:${PORTSDIR}/x11/kdelibs11
-
+USE_KDELIBS_VER=1
 GNU_CONFIGURE=	yes
-USE_QT=		yes
 CONFIGURE_ARGS+=--datadir=${PREFIX}
 CONFIGURE_ENV=	KDEDIR="${PREFIX}"

--- a/devel/ktranslator/Makefile
+++ b/devel/ktranslator/Makefile
@ -14,16 +14,13 @@ MASTER_SITE_SUBDIR=	Attic/old/1.1.2/apps/utils
 MAINTAINER=	ports@FreeBSD.org

 BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		kdecore.3:${PORTSDIR}/x11/kdelibs11
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg

-USE_QT=		yes
+USE_KDELIBS_VER=1
 USE_GMAKE=	yes
 USE_AUTOMAKE=	yes
 CONFIGURE_ENV=	QTDIR="${X11BASE}" KDEDIR="${LOCALBASE}"
-CONFIGURE_ARGS=	--with-qt-includes=${X11BASE}/include/X11/qt \
-		--with-extra-includes=${LOCALBASE}/include \
-		--with-extra-libs=${LOCALBASE}/lib
+CONFIGURE_ARGS=	--with-extra-includes=${LOCALBASE}/include

 post-patch:
 	@cd ${WRKSRC} && aclocal
--- a/devel/lincvs/Makefile
+++ b/devel/lincvs/Makefile
@ -13,7 +13,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}

 MAINTAINER=	jedgar@FreeBSD.org

-USE_QT2=	yes
+USE_QT_VER=	2
 WRKSRC=		${WRKDIR}/LinCVS-0.2.3

 do-configure:
--- a/devel/linguist/Makefile
+++ b/devel/linguist/Makefile
@ -17,15 +17,14 @@ BUILD_DEPENDS=	tmake:${PORTSDIR}/devel/tmake

 WRKSRC=		${WRKDIR}/${PORTNAME}

-USE_QT2=	yes
+USE_QT_VER=	2
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	TMAKEPATH="${LOCALBASE}/share/tmake/freebsd-g++" \
 		QTDIR="${X11BASE}"
 MAKE_ENV=	TMAKEPATH="${LOCALBASE}/share/tmake/freebsd-g++" \
-		QTDIR="${X11BASE}" \
-		MOC="${X11BASE}/bin/moc2"
+		QTDIR="${X11BASE}"
 MAKE_ARGS=	-e

 .include <bsd.port.pre.mk>
--- a/devel/moonshine/Makefile
+++ b/devel/moonshine/Makefile
@ -13,13 +13,10 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src

 MAINTAINER=	sobomax@FreeBSD.org

-USE_QT2=	yes
+USE_QT_VER=	2
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${X11BASE}/include
-
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"

 .include <bsd.port.pre.mk>

--- a/devel/qt-designer/Makefile
+++ b/devel/qt-designer/Makefile
@ -10,6 +10,12 @@ MASTERDIR=	${.CURDIR}/../../x11-toolkits/qt23
 PORTNAME=	qt-designer
 CATEGORIES=	devel

+post-patch:
+	${PERL} -pi -e "s@-fno-exceptions@-fno-exceptions -I${X11BASE}/include/qt2@g" ${CONFIG}
+
+do-build:
+	(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+
 .include "${MASTERDIR}/Makefile"

 LIB_DEPENDS+=	qt2.4:${PORTSDIR}/x11-toolkits/qt23
--- a/devel/qt-designer/files/patch-aa
+++ b/devel/qt-designer/files/patch-aa
@ -5,7 +5,7 @@
 # Compiling with support libraries
 SYSCONF_CXXFLAGS_X11	= -I/usr/X11R6/include
 -SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include
-+SYSCONF_CXXFLAGS_QT= -I$(QTDIR)/include -I/usr/X11R6/include/qt2 $(SYSCONF_CXXFLAGS_THREAD)
+SYSCONF_CXXFLAGS_QT= -I$(QTDIR)/include $(SYSCONF_CXXFLAGS_THREAD)
 SYSCONF_CXXFLAGS_OPENGL	= -I/usr/X11R6/include
 
 # Compiling YACC output
@ -51,10 +51,10 @@
 SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
 				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
 # Compiling application source
-SYSCONF_CXXFLAGS	= -pipe -O2
-SYSCONF_CFLAGS		= -pipe -O2
-+SYSCONF_CXXFLAGS	= -DQT_PREFIX=\"${PREFIX}\" -pipe -O2
-+SYSCONF_CFLAGS		= -DQT_PREFIX=\"${PREFIX}\" -pipe -O2
+-SYSCONF_CXXFLAGS	= -pipe -fno-exceptions -O2
+-SYSCONF_CFLAGS		= -pipe -fno-exceptions -O2
+SYSCONF_CXXFLAGS	= -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions
+SYSCONF_CFLAGS		= -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions
 # Default link type (static linking is still be used where required)
 SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_SHARED)
 SYSCONF_LINK_TARGET	= $(SYSCONF_LINK_TARGET_SHARED)
--- a/devel/qtarch/Makefile
+++ b/devel/qtarch/Makefile
@ -13,10 +13,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}

 MAINTAINER=	elwood@mc5sys.in-berlin.de

-LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11 \
-		kdeui.3:${PORTSDIR}/x11/kdelibs11
-
-USE_QT=		yes
+USE_KDELIBS_VER=1
 USE_GMAKE=	yes
 USE_XLIB=	yes
 WRKSRC=		${WRKDIR}/qtarch-1.4
--- a/devel/qtez/Makefile
+++ b/devel/qtez/Makefile
@ -16,12 +16,11 @@ MAINTAINER=	ports@FreeBSD.org

 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_QT2=	yes
+USE_QT_VER=	2
 USE_AUTOMAKE=	yes
 AUTOMAKE=	automake -a -i && ${PERL} automoc
 USE_LIBTOOL=	yes
-CONFIGURE_ENV=	QTDIR="${X11BASE}" MOC="${X11BASE}/bin/moc2" \
-		QTEZ="${PREFIX}/share/qtez"
+CONFIGURE_ENV=	QTDIR="${X11BASE}" QTEZ="${PREFIX}/share/qtez"
 MAKE_ENV=	QTEZ="${PREFIX}/share/qtez"
 INSTALLS_SHLIB=	yes

--- a/devel/sip/Makefile
+++ b/devel/sip/Makefile
@ -15,9 +15,9 @@ MAINTAINER=	adsharma@sharmas.dhs.org
 USE_PYTHON=	yes
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
-USE_QT2=	yes
+USE_QT_VER=	2
 INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--enable-qt --with-qt-includes=${X11BASE}/include/qt2
+CONFIGURE_ARGS=	--enable-qt
 CONFIGURE_ENV=	LDFLAGS=-lgcc

 .include <bsd.port.mk>
--- a/devel/tmake/Makefile
+++ b/devel/tmake/Makefile
@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.trolltech.com/freebies/tmake/
 MAINTAINER=	jesse@cs.uni-magdeburg.de

 USE_PERL5=	yes
-USE_QT2=	yes
+USE_QT_VER=	2
 NO_BUILD=	yes
 TMAKE_BIN=	progen tmake

--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@ -14,21 +14,12 @@ MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src

 MAINTAINER=	will@FreeBSD.org

-LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2 \
-		iconv.2:${PORTSDIR}/converters/iconv
+LIB_DEPENDS=	iconv.2:${PORTSDIR}/converters/iconv

-USE_QT2=	yes
-MOC?=		${X11BASE}/bin/moc2
+USE_KDELIBS_VER=2
 USE_BZIP2=	yes
-USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
 USE_AUTOCONF=	yes
-CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib \
-		--with-extra-libs=${LOCALBASE}/lib
-CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++"
 USE_GMAKE=	yes

 .include <bsd.port.mk>
--- a/editors/fine/Makefile
+++ b/editors/fine/Makefile
@ -14,9 +14,8 @@ DISTNAME=	${PORTNAME}${PORTVERSION}

 MAINTAINER=	ports@FreeBSD.org

-USE_NEWGCC=	yes
 USE_GMAKE=	yes
-USE_QT2=	yes
+USE_QT_VER=	2
 WRKSRC=		${WRKDIR}/fine

 .include <bsd.port.pre.mk>
--- a/editors/koffice-kde3/Makefile
+++ b/editors/koffice-kde3/Makefile
@ -14,21 +14,12 @@ MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src

 MAINTAINER=	will@FreeBSD.org

-LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2 \
-		iconv.2:${PORTSDIR}/converters/iconv
+LIB_DEPENDS=	iconv.2:${PORTSDIR}/converters/iconv

-USE_QT2=	yes
-MOC?=		${X11BASE}/bin/moc2
+USE_KDELIBS_VER=2
 USE_BZIP2=	yes
-USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
 USE_AUTOCONF=	yes
-CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib \
-		--with-extra-libs=${LOCALBASE}/lib
-CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++"
 USE_GMAKE=	yes

 .include <bsd.port.mk>
--- a/editors/koffice-kde4/Makefile
+++ b/editors/koffice-kde4/Makefile
@ -14,21 +14,12 @@ MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src

 MAINTAINER=	will@FreeBSD.org

-LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2 \
-		iconv.2:${PORTSDIR}/converters/iconv
+LIB_DEPENDS=	iconv.2:${PORTSDIR}/converters/iconv

-USE_QT2=	yes
-MOC?=		${X11BASE}/bin/moc2
+USE_KDELIBS_VER=2
 USE_BZIP2=	yes
-USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
 USE_AUTOCONF=	yes
-CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib \
-		--with-extra-libs=${LOCALBASE}/lib
-CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++"
 USE_GMAKE=	yes

 .include <bsd.port.mk>
--- a/editors/koffice/Makefile
+++ b/editors/koffice/Makefile
@ -14,21 +14,12 @@ MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src

 MAINTAINER=	will@FreeBSD.org

-LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2 \
-		iconv.2:${PORTSDIR}/converters/iconv
+LIB_DEPENDS=	iconv.2:${PORTSDIR}/converters/iconv

-USE_QT2=	yes
-MOC?=		${X11BASE}/bin/moc2
+USE_KDELIBS_VER=2
 USE_BZIP2=	yes
-USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
 USE_AUTOCONF=	yes
-CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib \
-		--with-extra-libs=${LOCALBASE}/lib
-CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++"
 USE_GMAKE=	yes

 .include <bsd.port.mk>
--- a/emulators/kmamerun/Makefile
+++ b/emulators/kmamerun/Makefile
@ -14,11 +14,9 @@ DISTNAME=	kmamerun-0.3.0pre1
 MAINTAINER=	nsayer@freebsd.org

 RUN_DEPENDS=	xmame:${PORTSDIR}/emulators/xmame
-LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11 \
-		kdeui.3:${PORTSDIR}/x11/kdelibs11

+USE_KDELIBS_VER=1
 GNU_CONFIGURE=	yes
-USE_QT=		yes
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"

--- a/emulators/ksnes9x/Makefile
+++ b/emulators/ksnes9x/Makefile
@ -13,11 +13,10 @@ MASTER_SITE_SUBDIR=	ksnes9x

 MAINTAINER=	ports@FreeBSD.org

-LIB_DEPENDS=	kdeui.3:${PORTSDIR}/x11/kdelibs11
 RUN_DEPENDS=	snes9x:${PORTSDIR}/emulators/snes9x

+USE_KDELIBS_VER=1
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_QT=		yes

 .include <bsd.port.mk>
--- a/finance/qhacc/Makefile
+++ b/finance/qhacc/Makefile
@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}

 MAINTAINER=	ports@FreeBSD.org

-USE_QT2=	yes
+USE_QT_VER=	2
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	QTDIR="${X11BASE}"
--- a/ftp/caitoo/Makefile
+++ b/ftp/caitoo/Makefile
@ -14,14 +14,8 @@ MASTER_SITE_SUBDIR=	unstable/apps/network

 MAINTAINER=	lioux@FreeBSD.org

-LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11 \
-		kdeui.3:${PORTSDIR}/x11/kdelibs11 \
-		kfile.3:${PORTSDIR}/x11/kdelibs11 \
-		kfm.3:${PORTSDIR}/x11/kdelibs11 \
-		mediatool.3:${PORTSDIR}/x11/kdelibs11
-
+USE_KDELIBS_VER=1
 USE_XLIB=	yes
-USE_QT=		yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
--- a/games/blackjack/Makefile
+++ b/games/blackjack/Makefile
@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org

 WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_QT=		yes
+USE_QT_VER=	1

 MAN1=		blackjack.1

--- a/games/kbubbles/Makefile
+++ b/games/kbubbles/Makefile
@ -13,10 +13,8 @@ MASTER_SITES=	http://hem.passagen.se/tonybj/kbubbles/
 MAINTAINER=	ports@FreeBSD.org

 BUILD_DEPENDS=	${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
-LIB_DEPENDS=	QwSpriteField.7:${PORTSDIR}/converters/kdesupport11 \
-		kdecore.3:${PORTSDIR}/x11/kdelibs11

+USE_KDELIBS_VER=1
 USE_LIBTOOL=	yes
-USE_QT=		yes

 .include <bsd.port.mk>
--- a/games/kdegames2/Makefile
+++ b/games/kdegames2/Makefile
@ -6,26 +6,16 @@
 #

 PORTNAME=	kdegames
-PORTVERSION=	2.1
+PORTVERSION=	2.1.1
 CATEGORIES=	games kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src

 MAINTAINER=	will@FreeBSD.org

-LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
-
-USE_QT2=	yes
-MOC?=		${X11BASE}/bin/moc2
+USE_KDELIBS_VER=2
 USE_BZIP2=	yes
-USE_NEWGCC=	yes
 USE_AUTOCONF=	yes
-CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib \
-		--with-extra-libs=${LOCALBASE}/lib
-CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" \
-		CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H"
 USE_GMAKE=	yes

 .include <bsd.port.mk>
--- a/games/kdegames2/distinfo
+++ b/games/kdegames2/distinfo
@ -1 +1 @@
-MD5 (kdegames-2.1.tar.bz2) = 62a7597b32e0dfec36f88ffd81a633f7
+MD5 (kdegames-2.1.1.tar.bz2) = decb4b934a30bd3d52fe68b5b058bbc9
--- a/games/kdegames3/Makefile
+++ b/games/kdegames3/Makefile
@ -6,26 +6,16 @@
 #

 PORTNAME=	kdegames
-PORTVERSION=	2.1
+PORTVERSION=	2.1.1
 CATEGORIES=	games kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src

 MAINTAINER=	will@FreeBSD.org

-LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
-
-USE_QT2=	yes
-MOC?=		${X11BASE}/bin/moc2
+USE_KDELIBS_VER=2
 USE_BZIP2=	yes
-USE_NEWGCC=	yes
 USE_AUTOCONF=	yes
-CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib \
-		--with-extra-libs=${LOCALBASE}/lib
-CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" \
-		CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H"
 USE_GMAKE=	yes

 .include <bsd.port.mk>
--- a/games/kdegames3/distinfo
+++ b/games/kdegames3/distinfo
@ -1 +1 @@
-MD5 (kdegames-2.1.tar.bz2) = 62a7597b32e0dfec36f88ffd81a633f7
+MD5 (kdegames-2.1.1.tar.bz2) = decb4b934a30bd3d52fe68b5b058bbc9
--- a/games/kdegames4/Makefile
+++ b/games/kdegames4/Makefile
@ -6,26 +6,16 @@
 #

 PORTNAME=	kdegames
-PORTVERSION=	2.1
+PORTVERSION=	2.1.1
 CATEGORIES=	games kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src

 MAINTAINER=	will@FreeBSD.org

-LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
-
-USE_QT2=	yes
-MOC?=		${X11BASE}/bin/moc2
+USE_KDELIBS_VER=2
 USE_BZIP2=	yes
-USE_NEWGCC=	yes
 USE_AUTOCONF=	yes
-CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib \
-		--with-extra-libs=${LOCALBASE}/lib
-CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" \
-		CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H"
 USE_GMAKE=	yes

 .include <bsd.port.mk>
--- a/games/kdegames4/distinfo
+++ b/games/kdegames4/distinfo
@ -1 +1 @@
-MD5 (kdegames-2.1.tar.bz2) = 62a7597b32e0dfec36f88ffd81a633f7
+MD5 (kdegames-2.1.1.tar.bz2) = decb4b934a30bd3d52fe68b5b058bbc9
--- a/games/krogue/Makefile
+++ b/games/krogue/Makefile
@ -15,12 +15,10 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org

 BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
-LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11

-USE_QT=		yes
+USE_KDELIBS_VER=1
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	QTDIR="${X11BASE}" KDEDIR="${LOCALBASE}"
-CONFIGURE_ARGS=	--with-qt-includes=${X11BASE}/include/X11/qt

 .include <bsd.port.mk>
--- a/games/krubik/Makefile
+++ b/games/krubik/Makefile
@ -13,9 +13,8 @@ MASTER_SITES=	http://www.phys.uu.nl/~eendebak/kde/
 MAINTAINER=	jedgar@fxp.org

 BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
-LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11

+USE_KDELIBS_VER=1
 GNU_CONFIGURE=	yes
-USE_QT=		yes

 .include <bsd.port.mk>
--- a/games/ktamaga/Makefile
+++ b/games/ktamaga/Makefile
@ -13,10 +13,8 @@ MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/unstable/apps/games/ \

 MAINTAINER=	se@freebsd.org

-LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11
+USE_KDELIBS_VER=1
 MAKE_ENV=	DEBUG_FL="$(CFLAGS)"
-
-USE_QT=		yes
 WRKSRC=		${WRKDIR}/tamaga-0.2

 .include <bsd.port.mk>
--- a/games/nethack-qt/Makefile
+++ b/games/nethack-qt/Makefile
@ -25,7 +25,7 @@ QT_PATCH=	qnethack-3.2.2.1.0.1.src.tar.gz
 QT_SOUND=	nhs.tar.gz
 EXTRACT_ONLY=	nethack-3.2.2.tar.gz

-USE_QT=		yes
+USE_QT_VER=	1
 USE_XPM=	yes
 USE_GMAKE=	yes
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
--- a/games/nethack33-qt/Makefile
+++ b/games/nethack33-qt/Makefile
@ -25,7 +25,7 @@ QT_PATCH=	qnethack-3.2.2.1.0.1.src.tar.gz
 QT_SOUND=	nhs.tar.gz
 EXTRACT_ONLY=	nethack-3.2.2.tar.gz

-USE_QT=		yes
+USE_QT_VER=	1
 USE_XPM=	yes
 USE_GMAKE=	yes
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
--- a/games/nethack34-qt/Makefile
+++ b/games/nethack34-qt/Makefile
@ -25,7 +25,7 @@ QT_PATCH=	qnethack-3.2.2.1.0.1.src.tar.gz
 QT_SOUND=	nhs.tar.gz
 EXTRACT_ONLY=	nethack-3.2.2.tar.gz

-USE_QT=		yes
+USE_QT_VER=	1
 USE_XPM=	yes
 USE_GMAKE=	yes
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
--- a/games/pp/Makefile
+++ b/games/pp/Makefile
@ -14,7 +14,7 @@ DISTFILES=	ppinst-0.01.tar.gz ppsrc-0.01.tar.gz
 MAINTAINER=	ports@FreeBSD.org

 WRKSRC=		${WRKDIR}/ppsrc
-USE_QT=		yes
+USE_QT_VER=	1
 USE_X_PREFIX=	yes

 do-install:
--- a/games/xlines/Makefile
+++ b/games/xlines/Makefile
@ -13,7 +13,7 @@ DISTNAME=	${PORTNAME}

 MAINTAINER=	ports@FreeBSD.org

-USE_QT=		yes
+USE_QT_VER=	1
 USE_X_PREFIX=	yes
 NO_WRKSUBDIR=	yes

--- a/graphics/avifile/Makefile
+++ b/graphics/avifile/Makefile
@ -19,7 +19,7 @@ LIB_DEPENDS=	SDL-1.1.3:${PORTSDIR}/devel/sdl-devel
 RUN_DEPENDS=	${CODEC_DETECTION_FILE}:${CODEC_PORT}

 ONLY_FOR_ARCHS=	i386
-USE_QT2=	yes
+USE_QT_VER=	2
 USE_XLIB=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
@ -28,11 +28,8 @@ USE_AUTOCONF=	yes
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
-		MOC="${MOC}" \
 		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib \
-		--with-win32-path=${LOCALBASE}/lib/win32 \
+CONFIGURE_ARGS=	--with-win32-path=${LOCALBASE}/lib/win32 \
 		--enable-release
 PLIST_SUB=	LIB_VERSION="${LIB_VERSION}"

@ -50,7 +47,6 @@ LIB_VERSION=	0
 EXTRA_BUILD_DIR=	player samples/benchmark samples/qtrecompress

 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
-MOC?=		${X11BASE}/bin/moc2
 DIFF?=		/usr/bin/diff

 .include <bsd.port.pre.mk>
--- a/graphics/ecg2png/Makefile
+++ b/graphics/ecg2png/Makefile
@ -15,11 +15,11 @@ MAINTAINER=	ports@FreeBSD.org

 LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd

-USE_QT2=	yes
+USE_QT_VER=	2
 WRKSRC=		${WRKDIR}/${PORTNAME}
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${X11BASE}/include/qt2 -I${LOCALBASE}/include/gd" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ARGS=	--x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib
+QTCPPFLAGS+=	-I/usr/local/include/gd
 USE_GMAKE=	yes
 USE_AUTOMAKE=	yes

--- a/graphics/imanager/Makefile
+++ b/graphics/imanager/Makefile
@ -13,10 +13,9 @@ DISTNAME=	imanager-${PORTVERSION}.final.imlib

 MAINTAINER=	ports@freebsd.org

-LIB_DEPENDS=	Imlib.5:${PORTSDIR}/graphics/imlib \
-		kdecore.3:${PORTSDIR}/x11/kdelibs11
+LIB_DEPENDS=	Imlib.5:${PORTSDIR}/graphics/imlib

-USE_QT=		yes
+USE_KDELIBS_VER=1
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes

--- a/graphics/kdegraphics2/Makefile
+++ b/graphics/kdegraphics2/Makefile
@ -6,28 +6,20 @@
 #

 PORTNAME=	kdegraphics
-PORTVERSION=	2.1
+PORTVERSION=	2.1.1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src

 MAINTAINER=	will@FreeBSD.org

-LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 BUILD_DEPENDS=	dvips:${PORTSDIR}/print/teTeX
 RUN_DEPENDS=	dvips:${PORTSDIR}/print/teTeX

-USE_QT2=	yes
-MOC?=		${X11BASE}/bin/moc2
+USE_KDELIBS_VER=2
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib
-CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
-		CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \
-		USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc"
 USE_GMAKE=	yes

 .include <bsd.port.mk>
--- a/graphics/kdegraphics2/distinfo
+++ b/graphics/kdegraphics2/distinfo
@ -1 +1 @@
-MD5 (kdegraphics-2.1.tar.bz2) = 3cb2294fc570fa771a834bef64d2bf33
+MD5 (kdegraphics-2.1.1.tar.bz2) = 686f47becc517d4e6358b35b8a6f2b58
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@ -6,28 +6,20 @@
 #

 PORTNAME=	kdegraphics
-PORTVERSION=	2.1
+PORTVERSION=	2.1.1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src

 MAINTAINER=	will@FreeBSD.org

-LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 BUILD_DEPENDS=	dvips:${PORTSDIR}/print/teTeX
 RUN_DEPENDS=	dvips:${PORTSDIR}/print/teTeX

-USE_QT2=	yes
-MOC?=		${X11BASE}/bin/moc2
+USE_KDELIBS_VER=2
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib
-CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
-		CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \
-		USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc"
 USE_GMAKE=	yes

 .include <bsd.port.mk>
--- a/graphics/kdegraphics3/distinfo
+++ b/graphics/kdegraphics3/distinfo
@ -1 +1 @@
-MD5 (kdegraphics-2.1.tar.bz2) = 3cb2294fc570fa771a834bef64d2bf33
+MD5 (kdegraphics-2.1.1.tar.bz2) = 686f47becc517d4e6358b35b8a6f2b58
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@ -6,28 +6,20 @@
 #

 PORTNAME=	kdegraphics
-PORTVERSION=	2.1
+PORTVERSION=	2.1.1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src

 MAINTAINER=	will@FreeBSD.org

-LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 BUILD_DEPENDS=	dvips:${PORTSDIR}/print/teTeX
 RUN_DEPENDS=	dvips:${PORTSDIR}/print/teTeX

-USE_QT2=	yes
-MOC?=		${X11BASE}/bin/moc2
+USE_KDELIBS_VER=2
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib
-CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
-		CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \
-		USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc"
 USE_GMAKE=	yes

 .include <bsd.port.mk>
--- a/graphics/kdegraphics4/distinfo
+++ b/graphics/kdegraphics4/distinfo
@ -1 +1 @@
-MD5 (kdegraphics-2.1.tar.bz2) = 3cb2294fc570fa771a834bef64d2bf33
+MD5 (kdegraphics-2.1.1.tar.bz2) = 686f47becc517d4e6358b35b8a6f2b58
--- a/graphics/killustrator/Makefile
+++ b/graphics/killustrator/Makefile
@ -12,12 +12,10 @@ MASTER_SITES=	http://wwwiti.cs.uni-magdeburg.de/~sattler/pub/killustrator/

 MAINTAINER=	jedgar@FreeBSD.org

-LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11 \
-		intl.1:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext \
 		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-RUN_DEPENDS=	${LOCALBASE}/bin/kdehelp:${PORTSDIR}/x11/kdebase11

-USE_QT=		yes
+USE_KDEBASE_VER=1
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
--- a/graphics/kplot3d/Makefile
+++ b/graphics/kplot3d/Makefile
@ -12,9 +12,7 @@ MASTER_SITES=	http://members.nbci.com/kplot3d/

 MAINTAINER=	jedgar@FreeBSD.org

-LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11
-
-USE_QT=		yes
+USE_KDELIBS_VER=1
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes

--- a/graphics/view3ds/Makefile
+++ b/graphics/view3ds/Makefile
@ -16,7 +16,7 @@ MAINTAINER=	sobomax@FreeBSD.org
 LIB_DEPENDS=	3ds.0:${PORTSDIR}/graphics/lib3ds

 USE_X_PREFIX=	yes
-USE_QT2=	yes
+USE_QT_VER=	2
 USE_MESA=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
--- a/hebrew/kde3-i18n/Makefile
+++ b/hebrew/kde3-i18n/Makefile
@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src

 MAINTAINER=	demon@FreeBSD.org

-LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2 \
-		intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext

+USE_KDELIBS_VER=2
 USE_BZIP2=	yes
 USE_GMAKE=	yes

--- a/hebrew/kde4-l10n/Makefile
+++ b/hebrew/kde4-l10n/Makefile
@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src

 MAINTAINER=	demon@FreeBSD.org

-LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2 \
-		intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext

+USE_KDELIBS_VER=2
 USE_BZIP2=	yes
 USE_GMAKE=	yes

--- a/hungarian/kde3-i18n/Makefile
+++ b/hungarian/kde3-i18n/Makefile
@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src

 MAINTAINER=	demon@FreeBSD.org

-LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2 \
-		intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext

+USE_KDELIBS_VER=2
 USE_BZIP2=	yes
 USE_GMAKE=	yes

--- a/hungarian/kde4-l10n/Makefile
+++ b/hungarian/kde4-l10n/Makefile
@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src

 MAINTAINER=	demon@FreeBSD.org

-LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2 \
-		intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext

+USE_KDELIBS_VER=2
 USE_BZIP2=	yes
 USE_GMAKE=	yes

--- a/irc/kvirc-devel/Makefile
+++ b/irc/kvirc-devel/Makefile
@ -22,8 +22,7 @@ MAN1=		kvirc.1
 USE_LIBTOOL=	yes
 USE_AUTOMAKE=	yes
 USE_AUTOCONF=	yes
-USE_NEWGCC=	yes
-USE_QT2=	yes
+USE_QT_VER=	2
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--x-includes=$(X11BASE)/include \
--- a/irc/kvirc/Makefile
+++ b/irc/kvirc/Makefile
@ -22,8 +22,7 @@ MAN1=		kvirc.1
 USE_LIBTOOL=	yes
 USE_AUTOMAKE=	yes
 USE_AUTOCONF=	yes
-USE_NEWGCC=	yes
-USE_QT2=	yes
+USE_QT_VER=	2
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--x-includes=$(X11BASE)/include \
--- a/japanese/kebook/Makefile
+++ b/japanese/kebook/Makefile
@ -13,16 +13,13 @@ MASTER_SITES=	http://www.os.rim.or.jp/~s_mitu/library/kebook/ \

 MAINTAINER=	hige@higesoft.os.rim.or.jp

-LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11 \
-		eb.3:${PORTSDIR}/japanese/eb
+LIB_DEPENDS=	eb.3:${PORTSDIR}/japanese/eb
 BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
-RUN_DEPENDS=	kfm:${PORTSDIR}/x11/kdebase11

+USE_KDEBASE_VER=1
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_NEWGCC=	yes
 USE_LIBTOOL=	yes
-USE_QT=		yes

 CONFIGURE_ARGS=	"--with-qt-dir=${QTDIR}" \
 		"--with-qt-includes=${QTDIR}/include/X11/qt" \
--- a/Show More
+++ b/Show More