Update to 2.4.1

Perform outsource build as recommended in supplementary docs
Remove bogus install target from port Makefile
Build and install documentation
Install desktop file
Mark MAKE_JOBS_UNSAFE temporary

devel/qtcreator/Makefile

@@ -7,14 +7,13 @@
 #
 
 PORTNAME=	qtcreator
-PORTVERSION=	2.0.1
+PORTVERSION=	2.4.1
 CATEGORIES=	devel
 MASTER_SITES=	http://download.qt.nokia.com/qtcreator/
 DISTNAME=	qt-creator-${PORTVERSION}-src
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt4 IDE
+COMMENT=	Qt Creator IDE and tools
 
 LIB_DEPENDS=	Imath.6:${PORTSDIR}/graphics/ilmbase \
 		IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
@@ -24,36 +23,35 @@ LIB_DEPENDS=	Imath.6:${PORTSDIR}/graphics/ilmbase \
 USE_QT_VER=	4
 QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build \
 		linguist_build assistant_run qt3support \
-		dbus designer gui help-tools network script \
-		sql svg xml webkit
+		dbus designer gui help-tools_build network script \
+		sql svg xml webkit qdoc3_build
 HAS_CONFIGURE=	yes
+MAKE_ENV+=	INSTALL_ROOT=${PREFIX}
+ALL_TARGET=	all docs
+INSTALL_TARGET=	install install_docs
 
 QMAKE_ARGS=	-recursive CONFIG+="configure" ${QMAKE_PRO}
-QMAKE_PRO=	qtcreator.pro
-
-MAKE_JOBS_SAFE=	yes
+QMAKE_PRO=	${WRKSRC}/${PORTNAME}.pro
 
+MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 
+CONFIGURE_WRKSRC=	${WRKDIR}/build
+BUILD_WRKSRC=		${CONFIGURE_WRKSRC}
+INSTALL_WRKSRC=		${CONFIGURE_WRKSRC}
+
+DESKTOP_ENTRIES=	"Qt Creator" "${COMMENT}" "${PORTNAME}" \
+			"${PORTNAME}" "" false
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|lrelease|lrelease-qt4|' \
+	${REINPLACE_CMD} -e 's|lrelease|lrelease-qt4|' \
 		${WRKSRC}/share/qtcreator/translations/translations.pro
-	@${REINPLACE_CMD} -e 's|lupdate|lupdate-qt4|' \
+	${REINPLACE_CMD} -e 's|lupdate|lupdate-qt4|' \
 	    ${WRKSRC}/share/qtcreator/translations/translations.pro
 
 do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+	${MKDIR} ${CONFIGURE_WRKSRC}
+	cd ${CONFIGURE_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
 		${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS}
 
-do-install:
-	${MKDIR} ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/qtcreator ${PREFIX}/bin/qtcreator
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/qtcreator_process_stub ${PREFIX}/bin/qtcreator_process_stub
-	${MKDIR} ${PREFIX}/lib/
-	cd ${WRKSRC}/lib/ && ${COPYTREE_SHARE} qtcreator ${PREFIX}/lib/
-	${MKDIR} ${PREFIX}/share/
-	cd ${WRKSRC}/share && ${COPYTREE_SHARE} qtcreator ${PREFIX}/share/
-	${MKDIR} ${PREFIX}/share/doc
-	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${PREFIX}/share/doc/qtcreator/
-
 .include <bsd.port.mk>

devel/qtcreator/distinfo

@@ -1,2 +1,2 @@
-SHA256 (qt-creator-2.0.1-src.tgz) = e682109f1ce4baf3ee54c0a3ead757c1334d26f2b8fed177458b6b183c40aee1
-SIZE (qt-creator-2.0.1-src.tgz) = 18350214
+SHA256 (qt-creator-2.4.1-src.tar.gz) = d72ad2dd9584933595fd987dfb4ec476c776743a587c493bd2eff2aaafb38897
+SIZE (qt-creator-2.4.1-src.tar.gz) = 26234171

devel/qtcreator/files/patch-src-plugins-qt4projectmanager-makestep.cpp

@@ -1,13 +1,15 @@
---- ./src/plugins/qt4projectmanager/makestep.cpp.orig	2010-08-24 11:46:09.000000000 +0400
-+++ ./src/plugins/qt4projectmanager/makestep.cpp	2010-11-29 00:21:08.727128457 +0300
-@@ -163,8 +163,10 @@
-     if (toolchain) {
-         if (toolchain->type() != ProjectExplorer::ToolChain::MSVC &&
-             toolchain->type() != ProjectExplorer::ToolChain::WINCE) {
+--- ./src/plugins/qt4projectmanager/makestep.cpp.orig	2012-01-24 14:37:13.000000000 +0000
++++ ./src/plugins/qt4projectmanager/makestep.cpp	2012-02-26 15:30:04.084747079 +0000
+@@ -201,10 +201,12 @@
+     // FIXME doing this without the user having a way to override this is rather bad
+     // so we only do it for unix and if the user didn't override the make command
+     // but for now this is the least invasive change
 +#ifndef Q_OS_FREEBSD
-             if (m_makeCmd.isEmpty())
-                 args << "-w";
+     if (toolchain
+             && toolchain->targetAbi().binaryFormat() != ProjectExplorer::Abi::PEFormat
+             && m_makeCmd.isEmpty())
+         Utils::QtcProcess::addArg(&args, QLatin1String("-w"));
 +#endif
-         }
-     }
  
+     setEnabled(true);
+     pp->setArguments(args);

devel/qtcreator/files/patch-src__libs__3rdparty__botan__src__src.pro

@@ -1,15 +0,0 @@
---- ./src/libs/3rdparty/botan/src/src.pro.orig	2010-08-24 11:46:09.000000000 +0400
-+++ ./src/libs/3rdparty/botan/src/src.pro	2010-11-29 03:49:46.829707166 +0300
-@@ -564,10 +564,6 @@
-            timer/gettimeofday/tm_unix.cpp
- }
- 
--linux*-g++* {
--    SOURCES += timer/posix_rt/tm_posix.cpp
--}
-+SOURCES += timer/posix_rt/tm_posix.cpp
- 
--linux*-g++* {
--    LIBS += -lrt
--}
-+LIBS += -lrt