Update KDE to the latest official release, KDE 3.1.3

Official KDE 3.1.3 announcement:
http://www.kde.org/announcements/announce-3.1.3.php

(may not work until a few hours after this commit - we jumped the gun a little
 in order to have the update in place at the time the security notifications for
 KDE 3.1.2 will be released together with the announcement of KDE 3.1.3).

Changelog from 3.1.2 to 3.1.3 release:
http://www.kde.org/announcements/changelogs/changelog3_1_2to3_1_3.php

Thanks and credits need to go to the whole KDE-FreeBSD team, as well
as everyone on kde@freebsd.org for providing feedback, reporting bugs
and just using the KDE ports.

Approved by: will (real mentor asleep)

3 files changed, 87 insertions, 18 deletions

diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index f408e42d4f0b..beb0e9581ad0 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -22,8 +22,7 @@ COMMENT=	A C++ X GUI toolkit
 
 LIB_DEPENDS+=	mng.1:${PORTSDIR}/graphics/libmng \
 		png.5:${PORTSDIR}/graphics/png \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		Xft.2:${PORTSDIR}/x11-fonts/Xft
+		jpeg.9:${PORTSDIR}/graphics/jpeg
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -39,10 +38,19 @@ CONFIGURE_ARGS=	-system-libpng -system-libjpeg -system-libmng	\
 		${CUPS} -shared -prefix ${PREFIX} -datadir ${DATADIR} \
 		-docdir ${DOCSDIR} -plugindir ${PREFIX}/lib/plugins
 
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_XFT)
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+.else
+CONFIGURE_ARGS+=-no-xft
+.endif
+
 .if defined(DEBUG)
-CONFIGURE_ARGS+=	-debug
+CONFIGURE_ARGS+= -debug
 .endif
 
+.if !defined(BUILD_PLUGIN_ONLY)
 .if !defined(WITHOUT_OPENGL)
 USE_MESA=	yes
 .else
@@ -55,19 +63,21 @@ CUPS=	-cups -L${LOCALBASE}/lib -I${LOCALBASE}/include
 .else
 CUPS=
 .endif
+.endif
 
+.if !defined(BUILD_PLUGIN_ONLY)
 CONFIGURE_ENV=	${ECHO} yes | QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
 MAKE_ENV?=	QTDIR=${WRKSRC} \
-		LD_LIBRARY_PATH=${WRKSRC}/lib:${LD_LIBRARY_PATH} \
+		LD_LIBRARY_PATH=${WRKSRC}/lib \
 		PATH=${WRKSRC}/bin:$$PATH
 ALL_TARGET=	sub-tools
-
-.include <bsd.port.pre.mk>
+.endif
 
 .if ${MACHINE_ARCH} == "alpha"
 CFLAGS+=	-O0
 .endif
 
+.if !defined(BUILD_PLUGIN_ONLY)
 .if !defined(WITHOUT_OPENGL)
 # Display WITH_OPENGL advisory.
 pre-everything::
@@ -78,6 +88,14 @@ pre-everything::
 	@${ECHO_MSG} '===> Ctrl-C now and set WITHOUT_OPENGL'
 	@${ECHO_MSG} '===> **************************************************'
 .endif
+.if !defined(WITHOUT_XFT)
+pre-everything::
+	@${ECHO_MSG}
+	@${ECHO_MSG} '===> **************************************************'
+	@${ECHO_MSG} '===> If you do not want to build QT with XFT support '
+	@${ECHO_MSG} '===> press Ctrl-C and set WITHOUT_XFT'
+	@${ECHO_MSG} '===> **************************************************'
+.endif
 
 .if ${XFREE86_VERSION} < 4
 BROKEN=	"The QT ${PORTVERSION} port does not support any XFree86 < 4.x"
@@ -87,8 +105,10 @@ BROKEN=	"The QT ${PORTVERSION} port does not support any XFree86 < 4.x"
 BROKEN=	"You have QT2 headers installed!  Installing this port"
 BROKEN+="will result in conflicts between QT3 and QT2!"
 .endif
+.endif
 
 post-patch:
+.if !defined(BUILD_PLUGIN_ONLY)
 	@${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -fr
 	@${RM} -fr ${WRKSRC}/examples ${WRKSRC}/tutorial
 	@cd ${WRKSRC}/include; \
@@ -96,6 +116,7 @@ post-patch:
 	@cd ${WRKSRC}/extensions/nsplugin/src; \
 		${RM} -f jri.h jri_md.h jritypes.h npapi.h npupp.h \
 		npunix.c npwin.cpp
+.endif
 	@${REINPLACE_CMD} -e 's,-O2,${CXXFLAGS},' \
 		${WRKSRC}/mkspecs/freebsd-g++/qmake.conf
 	@${REINPLACE_CMD} -e 's,gcc,${CC},' \
@@ -110,6 +131,7 @@ post-patch:
 		${WRKSRC}/mkspecs/freebsd-g++/qmake.conf
 	@${RM} ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf.bak
 
+.if !defined(BUILD_PLUGIN_ONLY)
 post-build:
 .for tool in makeqpf mergetr msg2qm qembed qvfb
 	cd ${WRKSRC}/tools/${tool}; ${SETENV} ${MAKE_ENV} ${MAKE}
@@ -122,5 +144,6 @@ pre-install:
 .for tool in makeqpf mergetr msg2qm qembed qvfb
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/${tool}/${tool} ${PREFIX}/bin
 .endfor
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index f408e42d4f0b..beb0e9581ad0 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -22,8 +22,7 @@ COMMENT=	A C++ X GUI toolkit
 
 LIB_DEPENDS+=	mng.1:${PORTSDIR}/graphics/libmng \
 		png.5:${PORTSDIR}/graphics/png \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		Xft.2:${PORTSDIR}/x11-fonts/Xft
+		jpeg.9:${PORTSDIR}/graphics/jpeg
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -39,10 +38,19 @@ CONFIGURE_ARGS=	-system-libpng -system-libjpeg -system-libmng	\
 		${CUPS} -shared -prefix ${PREFIX} -datadir ${DATADIR} \
 		-docdir ${DOCSDIR} -plugindir ${PREFIX}/lib/plugins
 
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_XFT)
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+.else
+CONFIGURE_ARGS+=-no-xft
+.endif
+
 .if defined(DEBUG)
-CONFIGURE_ARGS+=	-debug
+CONFIGURE_ARGS+= -debug
 .endif
 
+.if !defined(BUILD_PLUGIN_ONLY)
 .if !defined(WITHOUT_OPENGL)
 USE_MESA=	yes
 .else
@@ -55,19 +63,21 @@ CUPS=	-cups -L${LOCALBASE}/lib -I${LOCALBASE}/include
 .else
 CUPS=
 .endif
+.endif
 
+.if !defined(BUILD_PLUGIN_ONLY)
 CONFIGURE_ENV=	${ECHO} yes | QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
 MAKE_ENV?=	QTDIR=${WRKSRC} \
-		LD_LIBRARY_PATH=${WRKSRC}/lib:${LD_LIBRARY_PATH} \
+		LD_LIBRARY_PATH=${WRKSRC}/lib \
 		PATH=${WRKSRC}/bin:$$PATH
 ALL_TARGET=	sub-tools
-
-.include <bsd.port.pre.mk>
+.endif
 
 .if ${MACHINE_ARCH} == "alpha"
 CFLAGS+=	-O0
 .endif
 
+.if !defined(BUILD_PLUGIN_ONLY)
 .if !defined(WITHOUT_OPENGL)
 # Display WITH_OPENGL advisory.
 pre-everything::
@@ -78,6 +88,14 @@ pre-everything::
 	@${ECHO_MSG} '===> Ctrl-C now and set WITHOUT_OPENGL'
 	@${ECHO_MSG} '===> **************************************************'
 .endif
+.if !defined(WITHOUT_XFT)
+pre-everything::
+	@${ECHO_MSG}
+	@${ECHO_MSG} '===> **************************************************'
+	@${ECHO_MSG} '===> If you do not want to build QT with XFT support '
+	@${ECHO_MSG} '===> press Ctrl-C and set WITHOUT_XFT'
+	@${ECHO_MSG} '===> **************************************************'
+.endif
 
 .if ${XFREE86_VERSION} < 4
 BROKEN=	"The QT ${PORTVERSION} port does not support any XFree86 < 4.x"
@@ -87,8 +105,10 @@ BROKEN=	"The QT ${PORTVERSION} port does not support any XFree86 < 4.x"
 BROKEN=	"You have QT2 headers installed!  Installing this port"
 BROKEN+="will result in conflicts between QT3 and QT2!"
 .endif
+.endif
 
 post-patch:
+.if !defined(BUILD_PLUGIN_ONLY)
 	@${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -fr
 	@${RM} -fr ${WRKSRC}/examples ${WRKSRC}/tutorial
 	@cd ${WRKSRC}/include; \
@@ -96,6 +116,7 @@ post-patch:
 	@cd ${WRKSRC}/extensions/nsplugin/src; \
 		${RM} -f jri.h jri_md.h jritypes.h npapi.h npupp.h \
 		npunix.c npwin.cpp
+.endif
 	@${REINPLACE_CMD} -e 's,-O2,${CXXFLAGS},' \
 		${WRKSRC}/mkspecs/freebsd-g++/qmake.conf
 	@${REINPLACE_CMD} -e 's,gcc,${CC},' \
@@ -110,6 +131,7 @@ post-patch:
 		${WRKSRC}/mkspecs/freebsd-g++/qmake.conf
 	@${RM} ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf.bak
 
+.if !defined(BUILD_PLUGIN_ONLY)
 post-build:
 .for tool in makeqpf mergetr msg2qm qembed qvfb
 	cd ${WRKSRC}/tools/${tool}; ${SETENV} ${MAKE_ENV} ${MAKE}
@@ -122,5 +144,6 @@ pre-install:
 .for tool in makeqpf mergetr msg2qm qembed qvfb
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/${tool}/${tool} ${PREFIX}/bin
 .endfor
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index f408e42d4f0b..beb0e9581ad0 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -22,8 +22,7 @@ COMMENT=	A C++ X GUI toolkit
 
 LIB_DEPENDS+=	mng.1:${PORTSDIR}/graphics/libmng \
 		png.5:${PORTSDIR}/graphics/png \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		Xft.2:${PORTSDIR}/x11-fonts/Xft
+		jpeg.9:${PORTSDIR}/graphics/jpeg
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -39,10 +38,19 @@ CONFIGURE_ARGS=	-system-libpng -system-libjpeg -system-libmng	\
 		${CUPS} -shared -prefix ${PREFIX} -datadir ${DATADIR} \
 		-docdir ${DOCSDIR} -plugindir ${PREFIX}/lib/plugins
 
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_XFT)
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+.else
+CONFIGURE_ARGS+=-no-xft
+.endif
+
 .if defined(DEBUG)
-CONFIGURE_ARGS+=	-debug
+CONFIGURE_ARGS+= -debug
 .endif
 
+.if !defined(BUILD_PLUGIN_ONLY)
 .if !defined(WITHOUT_OPENGL)
 USE_MESA=	yes
 .else
@@ -55,19 +63,21 @@ CUPS=	-cups -L${LOCALBASE}/lib -I${LOCALBASE}/include
 .else
 CUPS=
 .endif
+.endif
 
+.if !defined(BUILD_PLUGIN_ONLY)
 CONFIGURE_ENV=	${ECHO} yes | QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
 MAKE_ENV?=	QTDIR=${WRKSRC} \
-		LD_LIBRARY_PATH=${WRKSRC}/lib:${LD_LIBRARY_PATH} \
+		LD_LIBRARY_PATH=${WRKSRC}/lib \
 		PATH=${WRKSRC}/bin:$$PATH
 ALL_TARGET=	sub-tools
-
-.include <bsd.port.pre.mk>
+.endif
 
 .if ${MACHINE_ARCH} == "alpha"
 CFLAGS+=	-O0
 .endif
 
+.if !defined(BUILD_PLUGIN_ONLY)
 .if !defined(WITHOUT_OPENGL)
 # Display WITH_OPENGL advisory.
 pre-everything::
@@ -78,6 +88,14 @@ pre-everything::
 	@${ECHO_MSG} '===> Ctrl-C now and set WITHOUT_OPENGL'
 	@${ECHO_MSG} '===> **************************************************'
 .endif
+.if !defined(WITHOUT_XFT)
+pre-everything::
+	@${ECHO_MSG}
+	@${ECHO_MSG} '===> **************************************************'
+	@${ECHO_MSG} '===> If you do not want to build QT with XFT support '
+	@${ECHO_MSG} '===> press Ctrl-C and set WITHOUT_XFT'
+	@${ECHO_MSG} '===> **************************************************'
+.endif
 
 .if ${XFREE86_VERSION} < 4
 BROKEN=	"The QT ${PORTVERSION} port does not support any XFree86 < 4.x"
@@ -87,8 +105,10 @@ BROKEN=	"The QT ${PORTVERSION} port does not support any XFree86 < 4.x"
 BROKEN=	"You have QT2 headers installed!  Installing this port"
 BROKEN+="will result in conflicts between QT3 and QT2!"
 .endif
+.endif
 
 post-patch:
+.if !defined(BUILD_PLUGIN_ONLY)
 	@${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -fr
 	@${RM} -fr ${WRKSRC}/examples ${WRKSRC}/tutorial
 	@cd ${WRKSRC}/include; \
@@ -96,6 +116,7 @@ post-patch:
 	@cd ${WRKSRC}/extensions/nsplugin/src; \
 		${RM} -f jri.h jri_md.h jritypes.h npapi.h npupp.h \
 		npunix.c npwin.cpp
+.endif
 	@${REINPLACE_CMD} -e 's,-O2,${CXXFLAGS},' \
 		${WRKSRC}/mkspecs/freebsd-g++/qmake.conf
 	@${REINPLACE_CMD} -e 's,gcc,${CC},' \
@@ -110,6 +131,7 @@ post-patch:
 		${WRKSRC}/mkspecs/freebsd-g++/qmake.conf
 	@${RM} ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf.bak
 
+.if !defined(BUILD_PLUGIN_ONLY)
 post-build:
 .for tool in makeqpf mergetr msg2qm qembed qvfb
 	cd ${WRKSRC}/tools/${tool}; ${SETENV} ${MAKE_ENV} ${MAKE}
@@ -122,5 +144,6 @@ pre-install:
 .for tool in makeqpf mergetr msg2qm qembed qvfb
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/${tool}/${tool} ${PREFIX}/bin
 .endfor
+.endif
 
 .include <bsd.port.post.mk>