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)

13 files changed, 19 insertions, 53 deletions

diff --git a/audio/kdemultimedia2/Makefile b/audio/kdemultimedia2/Makefile
index 994bee691883..d48aa57852fc 100644
--- 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:
diff --git a/audio/kdemultimedia2/distinfo b/audio/kdemultimedia2/distinfo
index dd29a54adee3..7c4c761d571e 100644
--- 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
diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile
index 994bee691883..d48aa57852fc 100644
--- 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:
diff --git a/audio/kdemultimedia3/distinfo b/audio/kdemultimedia3/distinfo
index dd29a54adee3..7c4c761d571e 100644
--- 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
diff --git a/audio/kmikmod/Makefile b/audio/kmikmod/Makefile
index 019b408d0d92..365b71ff7183 100644
--- 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
diff --git a/audio/kmp3/Makefile b/audio/kmp3/Makefile
index 065c19f8c388..d64566979953 100644
--- 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
diff --git a/audio/kmpg/Makefile b/audio/kmpg/Makefile
index 82445a5de404..524ec9a7a648 100644
--- 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
 
diff --git a/audio/knapster/Makefile b/audio/knapster/Makefile
index 1863d8b610d5..2bb38160a5a3 100644
--- 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>
diff --git a/audio/krio/Makefile b/audio/krio/Makefile
index 0cdb3892b8fd..189fba2c5daf 100644
--- 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>
diff --git a/audio/mq3/Makefile b/audio/mq3/Makefile
index 4306a9b3de13..ce899d8b40e7 100644
--- 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>
diff --git a/audio/musicbox/Makefile b/audio/musicbox/Makefile
index 3a440095d4d1..f7e3a89ada79 100644
--- 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
diff --git a/audio/xamp/Makefile b/audio/xamp/Makefile
index ffc1a488f6b9..4d2297a68596 100644
--- 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
diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile
index f3456bece2c9..c0fbeac02050 100644
--- 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}