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)

1 files changed, 2 insertions, 17 deletions

diff --git a/misc/khotkeys/Makefile b/misc/khotkeys/Makefile
index f4ec5985b049..83a6b1807ea8 100644
--- a/misc/khotkeys/Makefile
+++ b/misc/khotkeys/Makefile
@@ -12,26 +12,11 @@ MASTER_SITES=	http://dforce.sh.cvut.cz/~seli/en/khotkeys/
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11 \
-		kdeui.3:${PORTSDIR}/x11/kdelibs11 \
-		kfm.3:${PORTSDIR}/x11/kdelibs11 \
-		kfile.3:${PORTSDIR}/x11/kdelibs11
-RUN_DEPENDS=	kcontrol:${PORTSDIR}/x11/kdebase11
-
+USE_KDEBASE_VER=1
 NO_LATEST_LINK=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_NEWGCC=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	"--with-qt-includes=${QTDIR}/include/X11/qt" \
-		"--with-extra-includes=${LOCALBASE}/include" \
-		"--with-extra-libs=${LOCALBASE}/lib"
-CONFIGURE_ENV=	MOC=${X11BASE}/bin/moc QTDIR=${QTDIR}
-
-.if defined(PREFIX)
-QTDIR?=		${PREFIX}
-.else
-QTDIR?=		${X11BASE}
-.endif
+CONFIGURE_ARGS=	"--with-extra-includes=${LOCALBASE}/include"
 
 .include <bsd.port.mk>