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)

16 files changed, 24 insertions, 65 deletions

diff --git a/net/icqnix/Makefile b/net/icqnix/Makefile
index 252080d7ce00..2b902ecfbafa 100644
--- a/net/icqnix/Makefile
+++ b/net/icqnix/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	esdplay:${PORTSDIR}/audio/esound
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_QT=		yes
+USE_QT_VER=	1
 
 post-install:
 	@strip ${PREFIX}/bin/icqnix
diff --git a/net/kdenetwork2/Makefile b/net/kdenetwork2/Makefile
index 04ee0ab8718c..b4c8527e3d10 100644
--- a/net/kdenetwork2/Makefile
+++ b/net/kdenetwork2/Makefile
@@ -6,27 +6,19 @@
 #
 
 PORTNAME=	kdenetwork
-PORTVERSION=	2.1
+PORTVERSION=	2.1.1
 CATEGORIES=	net news kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	uu.1:${PORTSDIR}/converters/uulib \
-		kdecore.4:${PORTSDIR}/x11/kdelibs2
+LIB_DEPENDS=	uu.1:${PORTSDIR}/converters/uulib
 
-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 \
-		--with-extra-libs=${LOCALBASE}/lib
-CONFIGURE_ENV+=	LIBQT="-lqt2" MOC="${MOC}" \
-		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 -lgcc -lstdc++"
 USE_GMAKE=	yes
 
 pre-configure:
diff --git a/net/kdenetwork2/distinfo b/net/kdenetwork2/distinfo
index 75dc4a4ac432..505dde8f6f5b 100644
--- a/net/kdenetwork2/distinfo
+++ b/net/kdenetwork2/distinfo
@@ -1 +1 @@
-MD5 (kdenetwork-2.1.tar.bz2) = d810472975de84357c79c9f67ec400ad
+MD5 (kdenetwork-2.1.1.tar.bz2) = 66eed7247e672d0fe01581fc755f7136
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index 04ee0ab8718c..b4c8527e3d10 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -6,27 +6,19 @@
 #
 
 PORTNAME=	kdenetwork
-PORTVERSION=	2.1
+PORTVERSION=	2.1.1
 CATEGORIES=	net news kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	uu.1:${PORTSDIR}/converters/uulib \
-		kdecore.4:${PORTSDIR}/x11/kdelibs2
+LIB_DEPENDS=	uu.1:${PORTSDIR}/converters/uulib
 
-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 \
-		--with-extra-libs=${LOCALBASE}/lib
-CONFIGURE_ENV+=	LIBQT="-lqt2" MOC="${MOC}" \
-		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 -lgcc -lstdc++"
 USE_GMAKE=	yes
 
 pre-configure:
diff --git a/net/kdenetwork3/distinfo b/net/kdenetwork3/distinfo
index 75dc4a4ac432..505dde8f6f5b 100644
--- a/net/kdenetwork3/distinfo
+++ b/net/kdenetwork3/distinfo
@@ -1 +1 @@
-MD5 (kdenetwork-2.1.tar.bz2) = d810472975de84357c79c9f67ec400ad
+MD5 (kdenetwork-2.1.1.tar.bz2) = 66eed7247e672d0fe01581fc755f7136
diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index 04ee0ab8718c..b4c8527e3d10 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -6,27 +6,19 @@
 #
 
 PORTNAME=	kdenetwork
-PORTVERSION=	2.1
+PORTVERSION=	2.1.1
 CATEGORIES=	net news kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	uu.1:${PORTSDIR}/converters/uulib \
-		kdecore.4:${PORTSDIR}/x11/kdelibs2
+LIB_DEPENDS=	uu.1:${PORTSDIR}/converters/uulib
 
-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 \
-		--with-extra-libs=${LOCALBASE}/lib
-CONFIGURE_ENV+=	LIBQT="-lqt2" MOC="${MOC}" \
-		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 -lgcc -lstdc++"
 USE_GMAKE=	yes
 
 pre-configure:
diff --git a/net/kdenetwork4/distinfo b/net/kdenetwork4/distinfo
index 75dc4a4ac432..505dde8f6f5b 100644
--- a/net/kdenetwork4/distinfo
+++ b/net/kdenetwork4/distinfo
@@ -1 +1 @@
-MD5 (kdenetwork-2.1.tar.bz2) = d810472975de84357c79c9f67ec400ad
+MD5 (kdenetwork-2.1.1.tar.bz2) = 66eed7247e672d0fe01581fc755f7136
diff --git a/net/kdetelnet/Makefile b/net/kdetelnet/Makefile
index 296c560ee2ef..d331a451b223 100644
--- a/net/kdetelnet/Makefile
+++ b/net/kdetelnet/Makefile
@@ -14,15 +14,12 @@ 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_AUTOMAKE=	yes
 CONFIGURE_ENV=	QTDIR="${X11BASE}" KDEDIR="${LOCALBASE}"
-CONFIGURE_ARGS=	--with-qt-includes=${X11BASE}/include/X11/qt \
-		--with-extra-includes=${X11BASE}/include \
-		--with-extra-libs=${LOCALBASE}/lib \
+CONFIGURE_ARGS=	--with-extra-includes=${X11BASE}/include \
 		--program-transform-name='s,k,kde,'
 
 post-extract:
diff --git a/net/kicq/Makefile b/net/kicq/Makefile
index 0671c4753b4b..160fc754687a 100644
--- a/net/kicq/Makefile
+++ b/net/kicq/Makefile
@@ -13,10 +13,9 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	lioux@FreeBSD.org
 
-LIB_DEPENDS=	icq.1:${PORTSDIR}/net/icqlib \
-		kdecore.3:${PORTSDIR}/x11/kdelibs11
+LIB_DEPENDS=	icq.1:${PORTSDIR}/net/icqlib
 
-USE_QT=		yes
+USE_KDELIBS_VER=1
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
diff --git a/net/kmud/Makefile b/net/kmud/Makefile
index db65b8d5058d..49e192c2a71c 100644
--- a/net/kmud/Makefile
+++ b/net/kmud/Makefile
@@ -14,17 +14,13 @@ MASTER_SITE_SUBDIR=	games/muds
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11
 BUILD_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
-RUN_DEPENDS=	kdehelp:${PORTSDIR}/x11/kdebase11
 
-USE_QT=		yes
+USE_KDEBASE_VER=1
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib" \
 		QTDIR="${X11BASE}"
-CONFIGURE_ARGS=	--with-qt-includes=${X11BASE}/include/X11/qt \
-		--with-qt-libraries=${X11BASE}/lib
 
 pre-patch:
 	@${PERL} -pi -e "s|-ldl ||g" ${WRKSRC}/kmud/Makefile.in
diff --git a/net/ksamba/Makefile b/net/ksamba/Makefile
index 8be924f7e433..ffb3635299d8 100644
--- a/net/ksamba/Makefile
+++ b/net/ksamba/Makefile
@@ -13,9 +13,8 @@ MASTER_SITES=	${MASTER_SITE_KDE} \
 MASTER_SITE_SUBDIR=	unstable/apps/network
 
 BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
-LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11
 
-USE_QT=		yes
+USE_KDELIBS_VER=1
 USE_GMAKE=	yes
 USE_AUTOMAKE=	yes
 CONFIGURE_ENV=	QTDIR="${X11BASE}" KDEDIR="${LOCALBASE}" \
diff --git a/net/kxicq-devel/Makefile b/net/kxicq-devel/Makefile
index a4b23ac103a8..f8894397b174 100644
--- a/net/kxicq-devel/Makefile
+++ b/net/kxicq-devel/Makefile
@@ -13,11 +13,9 @@ DISTNAME=	${PORTNAME}-03132000
 
 MAINTAINER=	andrey@novikov.com
 
-LIB_DEPENDS=	kdeui.3:${PORTSDIR}/x11/kdelibs11
-
+USE_KDELIBS_VER=1
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-USE_QT=		yes
 
 DIST_SUBDIR=	kxicq
 
diff --git a/net/kxicq/Makefile b/net/kxicq/Makefile
index a4b23ac103a8..f8894397b174 100644
--- a/net/kxicq/Makefile
+++ b/net/kxicq/Makefile
@@ -13,11 +13,9 @@ DISTNAME=	${PORTNAME}-03132000
 
 MAINTAINER=	andrey@novikov.com
 
-LIB_DEPENDS=	kdeui.3:${PORTSDIR}/x11/kdelibs11
-
+USE_KDELIBS_VER=1
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-USE_QT=		yes
 
 DIST_SUBDIR=	kxicq
 
diff --git a/net/licq-devel/Makefile b/net/licq-devel/Makefile
index 3d5f273dcc50..5fc3130f8b56 100644
--- a/net/licq-devel/Makefile
+++ b/net/licq-devel/Makefile
@@ -19,14 +19,12 @@ MAINTAINER=	green@FreeBSD.org
 
 BUILD_DEPENDS=	aclocal:${PORTSDIR}/devel/automake
 
-USE_QT2=	yes
+USE_QT_VER=	2
 USE_GMAKE=	yes
 USE_AUTOCONF=	yes
-USE_NEWGCC=	yes
 USE_OPENSSL=	yes
 USE_PERL5=	yes
 
-CONFIGURE_ARGS=	--with-qt-includes=${X11BASE}/include/qt2
 CONFIGURE_TARGET=	$(ARCH)-unknown-freebsdelf$(OSREL)
 
 post-patch:
diff --git a/net/licq/Makefile b/net/licq/Makefile
index 3d5f273dcc50..5fc3130f8b56 100644
--- a/net/licq/Makefile
+++ b/net/licq/Makefile
@@ -19,14 +19,12 @@ MAINTAINER=	green@FreeBSD.org
 
 BUILD_DEPENDS=	aclocal:${PORTSDIR}/devel/automake
 
-USE_QT2=	yes
+USE_QT_VER=	2
 USE_GMAKE=	yes
 USE_AUTOCONF=	yes
-USE_NEWGCC=	yes
 USE_OPENSSL=	yes
 USE_PERL5=	yes
 
-CONFIGURE_ARGS=	--with-qt-includes=${X11BASE}/include/qt2
 CONFIGURE_TARGET=	$(ARCH)-unknown-freebsdelf$(OSREL)
 
 post-patch:
diff --git a/net/pppload/Makefile b/net/pppload/Makefile
index 78ffd44a02c6..0fca107fb16e 100644
--- a/net/pppload/Makefile
+++ b/net/pppload/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=		system/network/serial/ppp
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_QT=		yes
+USE_QT_VER=	1
 USE_GMAKE=	yes
 
 MAN1=		pppload.1