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)

20 files changed, 38 insertions, 94 deletions

diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 6f29382..25c30b0 100644
--- 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
diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
index ae10737..ad30f6a 100644
--- 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>
diff --git a/devel/kdelibdocs/Makefile b/devel/kdelibdocs/Makefile
index cd682fe..996430f 100644
--- 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>
diff --git a/devel/kdesdk/Makefile b/devel/kdesdk/Makefile
index cbade25..8cd3104 100644
--- 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
diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index cbade25..8cd3104 100644
--- 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
diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile
index cbade25..8cd3104 100644
--- 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
diff --git a/devel/kdestudio/Makefile b/devel/kdestudio/Makefile
index dffea51..c8fcfa1 100644
--- 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/"
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index 11e6146..4fbda92 100644
--- 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)
diff --git a/devel/kdevelop/distinfo b/devel/kdevelop/distinfo
index 48e73cd..75c6570 100644
--- 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
diff --git a/devel/kpp/Makefile b/devel/kpp/Makefile
index 9434a58..c19d87c 100644
--- 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}"
 
diff --git a/devel/ktranslator/Makefile b/devel/ktranslator/Makefile
index dcf4f0f..e76d8db 100644
--- 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
diff --git a/devel/lincvs/Makefile b/devel/lincvs/Makefile
index 31ff0bf..65b4461 100644
--- 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:
diff --git a/devel/linguist/Makefile b/devel/linguist/Makefile
index 6115102..028dc1f 100644
--- 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>
diff --git a/devel/moonshine/Makefile b/devel/moonshine/Makefile
index 76c5424..53cdb3f 100644
--- 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>
 
diff --git a/devel/qt-designer/Makefile b/devel/qt-designer/Makefile
index cee1a28..0ca0b97 100644
--- 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
diff --git a/devel/qt-designer/files/patch-aa b/devel/qt-designer/files/patch-aa
index 119251b..6950993 100644
--- 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)
diff --git a/devel/qtarch/Makefile b/devel/qtarch/Makefile
index a7e3302..b5cd729 100644
--- 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
diff --git a/devel/qtez/Makefile b/devel/qtez/Makefile
index a9fb8ad..2058f2a 100644
--- 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
 
diff --git a/devel/sip/Makefile b/devel/sip/Makefile
index ec5a25f..3101293 100644
--- 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>
diff --git a/devel/tmake/Makefile b/devel/tmake/Makefile
index d59e7d0..dd62e86 100644
--- 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