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, 41 insertions, 35 deletions

diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk
index 1f6ddde7860d..ef6ae5d2237c 100644
--- 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.