Changes 2.0.1:

* Compatibility with Qt-4.7.x

13 files changed, 131 insertions, 78 deletions

diff --git a/x11/qt4-creator/Makefile b/x11/qt4-creator/Makefile
index 38104633fce..c30dccf51fa 100644
--- a/x11/qt4-creator/Makefile
+++ b/x11/qt4-creator/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2010/11/15 22:59:09 abs Exp $
-#
+# $NetBSD: Makefile,v 1.6 2010/11/18 22:52:04 adam Exp $
 
-DISTNAME=	qt-creator-1.3.1-src
-PKGNAME=	qt4-creator-1.3.1
-PKGREVISION=	4
+DISTNAME=	qt-creator-2.0.1-src
+PKGNAME=	${DISTNAME:S/qt-/qt4-/:S/-src//}
 CATEGORIES=	devel
 MASTER_SITES=	http://get.qt.nokia.com/qtcreator/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	fw@submerge.ch
 HOMEPAGE=	http://www.qtsoftware.com/
@@ -16,13 +15,13 @@ USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake
 
-INSTALLATION_DIRS=      bin lib/qtcreator lib/qtcreator/plugins/Nokia \
+INSTALLATION_DIRS=	bin lib/qtcreator lib/qtcreator/plugins/Nokia \
 			share/doc/qtcreator share/pixmaps share/qtcreator \
 			share/qtcreator/translations
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-BUILD_DEPENDS+=	qt4-tools>=4.6.0:../../x11/qt4-tools \
-		qt4-sqlite3>=4.6.0:../../x11/qt4-sqlite3
+BUILD_DEPENDS+=	qt4-tools>=4.7.0:../../x11/qt4-tools \
+		qt4-sqlite3>=4.7.0:../../x11/qt4-sqlite3
 
 BUILD_TARGET=	make_default qch_docs
 MAKE_ENV+=	PREFIX=${PREFIX}
@@ -32,7 +31,7 @@ do-configure:
 
 do-install:
 	${LIBTOOL} --mode=install \
-		${INSTALL_PROGRAM} ${WRKSRC}/bin/qtcreator.bin \
+		${INSTALL_PROGRAM} ${WRKSRC}/bin/qtcreator \
 		${DESTDIR}${PREFIX}/bin/qtcreator
 	${LIBTOOL} --mode=install \
 		${INSTALL_PROGRAM} ${WRKSRC}/bin/qtcreator_process_stub \
@@ -47,7 +46,7 @@ do-install:
 		${INSTALL_DATA} ${WRKSRC}/lib/qtcreator/plugins/Nokia/*.pluginspec \
 		${DESTDIR}${PREFIX}/lib/qtcreator/plugins/Nokia/
 	${INSTALL_DATA} \
-		 ${WRKSRC}/src/plugins/coreplugin/images/qtcreator_logo*.png \
+		${WRKSRC}/src/plugins/coreplugin/images/qtcreator_logo*.png \
 		${DESTDIR}${PREFIX}/share/pixmaps/
 	${INSTALL_DATA} ${WRKSRC}/share/doc/qtcreator/qtcreator.qch \
 		${DESTDIR}${PREFIX}/share/doc/qtcreator/
@@ -62,6 +61,5 @@ do-install:
                 ${INSTALL_DATA} "${WRKSRC}/share/qtcreator/{}" \
 		"${DESTDIR}${PREFIX}/share/qtcreator/{}" ";"
 
-
 .include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt4-creator/PLIST b/x11/qt4-creator/PLIST
index 6aadfc7f039..636f0f96af4 100644
--- a/x11/qt4-creator/PLIST
+++ b/x11/qt4-creator/PLIST
@@ -1,12 +1,16 @@
-@comment $NetBSD: PLIST,v 1.2 2010/05/19 17:51:22 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/11/18 22:52:04 adam Exp $
 bin/qtcreator
 bin/qtcreator_process_stub
 lib/qtcreator/libAggregation.la
+lib/qtcreator/libBotan.la
 lib/qtcreator/libCPlusPlus.la
 lib/qtcreator/libDebuggingHelper.la
 lib/qtcreator/libExtensionSystem.la
+lib/qtcreator/libNet7ssh.la
+lib/qtcreator/libQmlJS.la
 lib/qtcreator/libQtConcurrent.la
 lib/qtcreator/libUtils.la
+lib/qtcreator/libsymbianutils.la
 lib/qtcreator/plugins/Nokia/BinEditor.pluginspec
 lib/qtcreator/plugins/Nokia/Bookmarks.pluginspec
 lib/qtcreator/plugins/Nokia/CMakeProjectManager.pluginspec
@@ -22,12 +26,12 @@ lib/qtcreator/plugins/Nokia/Find.pluginspec
 lib/qtcreator/plugins/Nokia/GenericProjectManager.pluginspec
 lib/qtcreator/plugins/Nokia/Help.pluginspec
 lib/qtcreator/plugins/Nokia/Locator.pluginspec
+lib/qtcreator/plugins/Nokia/Mercurial.pluginspec
 lib/qtcreator/plugins/Nokia/Perforce.pluginspec
 lib/qtcreator/plugins/Nokia/ProjectExplorer.pluginspec
-lib/qtcreator/plugins/Nokia/QmlEditor.pluginspec
+lib/qtcreator/plugins/Nokia/QmlJSEditor.pluginspec
 lib/qtcreator/plugins/Nokia/QmlProjectManager.pluginspec
 lib/qtcreator/plugins/Nokia/Qt4ProjectManager.pluginspec
-lib/qtcreator/plugins/Nokia/QtScriptEditor.pluginspec
 lib/qtcreator/plugins/Nokia/ResourceEditor.pluginspec
 lib/qtcreator/plugins/Nokia/ScmGit.pluginspec
 lib/qtcreator/plugins/Nokia/Subversion.pluginspec
@@ -49,12 +53,12 @@ lib/qtcreator/plugins/Nokia/libFind.la
 lib/qtcreator/plugins/Nokia/libGenericProjectManager.la
 lib/qtcreator/plugins/Nokia/libHelp.la
 lib/qtcreator/plugins/Nokia/libLocator.la
+lib/qtcreator/plugins/Nokia/libMercurial.la
 lib/qtcreator/plugins/Nokia/libPerforce.la
 lib/qtcreator/plugins/Nokia/libProjectExplorer.la
-lib/qtcreator/plugins/Nokia/libQmlEditor.la
+lib/qtcreator/plugins/Nokia/libQmlJSEditor.la
 lib/qtcreator/plugins/Nokia/libQmlProjectManager.la
 lib/qtcreator/plugins/Nokia/libQt4ProjectManager.la
-lib/qtcreator/plugins/Nokia/libQtScriptEditor.la
 lib/qtcreator/plugins/Nokia/libResourceEditor.la
 lib/qtcreator/plugins/Nokia/libScmGit.la
 lib/qtcreator/plugins/Nokia/libSubversion.la
@@ -78,10 +82,13 @@ share/qtcreator/designer/templates/Main_Window.ui
 share/qtcreator/designer/templates/Widget.ui
 share/qtcreator/gdbmacros/LGPL_EXCEPTION.TXT
 share/qtcreator/gdbmacros/LICENSE.LGPL
+share/qtcreator/gdbmacros/dumper.py
 share/qtcreator/gdbmacros/gdbmacros.cpp
 share/qtcreator/gdbmacros/gdbmacros.h
 share/qtcreator/gdbmacros/gdbmacros.pro
+share/qtcreator/gdbmacros/gdbmacros.py
 share/qtcreator/gdbmacros/gdbmacros_p.h
+share/qtcreator/gdbmacros/pdumper.py
 share/qtcreator/gdbmacros/test/dumpertest.pro
 share/qtcreator/gdbmacros/test/main.cpp
 share/qtcreator/schemes/MS_Visual_C++.kms
@@ -94,8 +101,9 @@ share/qtcreator/snippets/for.snp
 share/qtcreator/snippets/foreach.snp
 share/qtcreator/snippets/if.snp
 share/qtcreator/snippets/ifelse.snp
+share/qtcreator/snippets/qml.xml
+share/qtcreator/styles/darkvim.xml
 share/qtcreator/styles/default.xml
-share/qtcreator/styles/fakevim.xml
 share/qtcreator/styles/grayscale.xml
 share/qtcreator/templates/qt4project/customwidgetwizard/tpl_collection.cpp
 share/qtcreator/templates/qt4project/customwidgetwizard/tpl_collection.h
@@ -113,11 +121,25 @@ share/qtcreator/templates/qt4project/mywidget.h
 share/qtcreator/templates/qt4project/mywidget_form.cpp
 share/qtcreator/templates/qt4project/mywidget_form.h
 share/qtcreator/templates/qt4project/widget.ui
+share/qtcreator/templates/wizards/README.txt
+share/qtcreator/templates/wizards/helloworld/console.png
+share/qtcreator/templates/wizards/helloworld/main.cpp
+share/qtcreator/templates/wizards/helloworld/project.pro
+share/qtcreator/templates/wizards/helloworld/wizard_sample.xml
+share/qtcreator/templates/wizards/listmodel/listmodel.cpp
+share/qtcreator/templates/wizards/listmodel/listmodel.h
+share/qtcreator/templates/wizards/listmodel/wizard_sample.xml
+share/qtcreator/templates/wizards/qml-extension/lib.png
+share/qtcreator/templates/wizards/qml-extension/object.cpp
+share/qtcreator/templates/wizards/qml-extension/object.h
+share/qtcreator/templates/wizards/qml-extension/plugin.cpp
+share/qtcreator/templates/wizards/qml-extension/plugin.h
+share/qtcreator/templates/wizards/qml-extension/project.pro
+share/qtcreator/templates/wizards/qml-extension/qmldir
+share/qtcreator/templates/wizards/qml-extension/wizard.xml
+share/qtcreator/translations/qtcreator_cs.qm
 share/qtcreator/translations/qtcreator_de.qm
-share/qtcreator/translations/qtcreator_es.qm
 share/qtcreator/translations/qtcreator_fr.qm
-share/qtcreator/translations/qtcreator_it.qm
 share/qtcreator/translations/qtcreator_ja.qm
 share/qtcreator/translations/qtcreator_pl.qm
 share/qtcreator/translations/qtcreator_ru.qm
-share/qtcreator/translations/qtcreator_sl.qm
diff --git a/x11/qt4-creator/distinfo b/x11/qt4-creator/distinfo
index 4e81e5e6f5e..8d7509f5fd4 100644
--- a/x11/qt4-creator/distinfo
+++ b/x11/qt4-creator/distinfo
@@ -1,20 +1,21 @@
-$NetBSD: distinfo,v 1.2 2010/05/19 17:51:22 drochner Exp $
+$NetBSD: distinfo,v 1.3 2010/11/18 22:52:04 adam Exp $
 
-SHA1 (qt-creator-1.3.1-src.tar.gz) = 49b61c3e8010d94d6d595fef38d3da737b26cd80
-RMD160 (qt-creator-1.3.1-src.tar.gz) = 37bebc4566cfef85d5a7901c1efd8b917b3a0584
-Size (qt-creator-1.3.1-src.tar.gz) = 10623442 bytes
-SHA1 (patch-aa) = 908f98fcfcd7341aef924efa74938409b51e5b09
+SHA1 (qt-creator-2.0.1-src.tgz) = 605bfe7876c4fa322544bc2314b059767eae407f
+RMD160 (qt-creator-2.0.1-src.tgz) = f33a58c926bd710b4688bb5292fa66c417e78070
+Size (qt-creator-2.0.1-src.tgz) = 18350214 bytes
+SHA1 (patch-aa) = 02e9af5be92a1ed526df1993944804ed51a4c852
 SHA1 (patch-ab) = f0acd533050e7f310dba5981eef0f51992d3a41c
-SHA1 (patch-ac) = 80f3a0669ba9c830ac9ddc79dd0e56bbc95bb693
-SHA1 (patch-ad) = d416f3d5f0e28f2b825aa3943499f0cd9896e8b6
+SHA1 (patch-ac) = 9f2427a642c5c4fb7204da2144bda1c04931e024
+SHA1 (patch-ad) = 2f3349e9e3ef5f1c784e3025ea0a520e4e452089
 SHA1 (patch-ae) = 8fa1abb214473b438926d5c0d8cec7671f5c8397
 SHA1 (patch-af) = 199ab3a05c40c9d171e553713ea560367952995e
 SHA1 (patch-ag) = bbfd6e80e323f0a1cf11bc5ef345d2a23edcffc5
-SHA1 (patch-ah) = 56000810ffefa7fbb12d3d36bc656b428c7231cc
-SHA1 (patch-ai) = 6bf785c891cf8a41ce23810975a9c7b3f8afa5b1
-SHA1 (patch-aj) = 82e4a688fc287e08c0c425d601e78f95252d5011
+SHA1 (patch-ah) = cd8f1912a1b9d42122bfac0d24e5d8c1fe74c817
+SHA1 (patch-ai) = 05442266c37d57b0ca286806f028fa43975f3d18
+SHA1 (patch-aj) = 0db253a717050aed6ae79df3aa749804ae17befd
 SHA1 (patch-ak) = 5c33cd0733f84c850856bf7c178fdb0596e1592b
 SHA1 (patch-al) = b8e116a70ec00c4b5bb50f5c2181d438e81de54f
-SHA1 (patch-am) = e57f6240c0f3eda90c4fe34b4299b7b453b84008
-SHA1 (patch-an) = 3ad25e76cd7b504175e879bbd5ee72f886cfc338
-SHA1 (patch-ao) = 37183d831e12d4e49ae6f96619fa56febf41afa8
+SHA1 (patch-am) = 075cfbe1b642f1913976c0cbdf40041e912b308b
+SHA1 (patch-an) = 9b2183299919cea25216143ffdd283e10654fdb7
+SHA1 (patch-ao) = 4359debaebeb4686b8b6b4efefb1f7b480c0287c
+SHA1 (patch-ap) = a96b4a03ce289870fe2a3102e1945e42a57a9459
diff --git a/x11/qt4-creator/patches/patch-aa b/x11/qt4-creator/patches/patch-aa
index 5e86b8f043a..45fb54bf3e6 100644
--- a/x11/qt4-creator/patches/patch-aa
+++ b/x11/qt4-creator/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2010/05/18 19:44:02 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2010/11/18 22:52:04 adam Exp $
 
---- doc/doc.pri.orig	2010-01-15 17:36:52 +0000
+--- doc/doc.pri.orig	2010-08-24 07:46:09.000000000 +0000
 +++ doc/doc.pri
-@@ -24,7 +24,7 @@ qch_docs.depends += html_docs
+@@ -33,7 +33,7 @@ qch_docs.depends += html_docs
  qch_docs.files = $$QCH_FILE
  
  unix:!macx {
diff --git a/x11/qt4-creator/patches/patch-ac b/x11/qt4-creator/patches/patch-ac
index e7a2d14446a..387963280c2 100644
--- a/x11/qt4-creator/patches/patch-ac
+++ b/x11/qt4-creator/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.1.1.1 2010/05/18 19:44:02 drochner Exp $
+$NetBSD: patch-ac,v 1.2 2010/11/18 22:52:04 adam Exp $
 
---- share/qtcreator/static.pro.orig	2010-01-15 17:36:52 +0000
+--- share/qtcreator/static.pro.orig	2010-08-24 07:46:09.000000000 +0000
 +++ share/qtcreator/static.pro
 @@ -6,7 +6,7 @@ CONFIG -= qt
  QT =
@@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2010/05/18 19:44:02 drochner Exp $
      phony_src.name = CREATE phony.c
      phony_src.CONFIG += combine
      QMAKE_EXTRA_COMPILERS += phony_src
-@@ -60,7 +60,7 @@ DATA_DIRS = \
+@@ -62,7 +62,7 @@ DATA_DIRS = \
  !macx {
      for(data_dir, DATA_DIRS) {
          eval($${data_dir}.files = $$quote($$PWD/$$data_dir))
diff --git a/x11/qt4-creator/patches/patch-ad b/x11/qt4-creator/patches/patch-ad
index e2cfde59227..a68f2d40181 100644
--- a/x11/qt4-creator/patches/patch-ad
+++ b/x11/qt4-creator/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2010/05/18 19:44:02 drochner Exp $
+$NetBSD: patch-ad,v 1.2 2010/11/18 22:52:04 adam Exp $
 
---- share/qtcreator/translations/translations.pro.orig	2010-01-15 17:36:52 +0000
+--- share/qtcreator/translations/translations.pro.orig	2010-08-24 07:46:09.000000000 +0000
 +++ share/qtcreator/translations/translations.pro
-@@ -43,7 +43,7 @@ updateqm.name = LRELEASE ${QMAKE_FILE_IN
+@@ -83,7 +83,7 @@ updateqm.name = LRELEASE ${QMAKE_FILE_IN
  updateqm.CONFIG += no_link
  QMAKE_EXTRA_COMPILERS += updateqm
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2010/05/18 19:44:02 drochner Exp $
      QMAKE_LINK = @: IGNORE THIS LINE
      OBJECTS_DIR =
      win32:CONFIG -= embed_manifest_exe
-@@ -53,13 +53,13 @@ isEmpty(vcproj) {
+@@ -93,13 +93,13 @@ isEmpty(vcproj) {
      phony_src.input = PHONY_DEPS
      phony_src.output = phony.c
      phony_src.variable_out = GENERATED_SOURCES
diff --git a/x11/qt4-creator/patches/patch-ah b/x11/qt4-creator/patches/patch-ah
index c8eda62c938..b8ec1f3440f 100644
--- a/x11/qt4-creator/patches/patch-ah
+++ b/x11/qt4-creator/patches/patch-ah
@@ -1,13 +1,13 @@
-$NetBSD: patch-ah,v 1.1.1.1 2010/05/18 19:44:02 drochner Exp $
+$NetBSD: patch-ah,v 1.2 2010/11/18 22:52:04 adam Exp $
 
---- src/plugins/coreplugin/coreplugin.pro.orig	2010-01-15 17:36:52 +0000
+--- src/plugins/coreplugin/coreplugin.pro.orig	2010-08-24 07:46:09.000000000 +0000
 +++ src/plugins/coreplugin/coreplugin.pro
-@@ -168,7 +168,7 @@ RESOURCES += core.qrc \
-     fancyactionbar.qrc
- unix:!macx { 
+@@ -197,7 +197,7 @@ else:unix {
+     SOURCES += progressmanager/progressmanager_x11.cpp
+ 
      images.files = images/qtcreator_logo_*.png
 -    images.path = /share/pixmaps
 +    images.path = $(PREFIX)/share/pixmaps
      INSTALLS += images
  }
- OTHER_FILES += Core.pluginspec
+ OTHER_FILES += Core.pluginspec editormanager/BinFiles.mimetypes.xml
diff --git a/x11/qt4-creator/patches/patch-ai b/x11/qt4-creator/patches/patch-ai
index cd9ff5ce8ee..1f049d7b23c 100644
--- a/x11/qt4-creator/patches/patch-ai
+++ b/x11/qt4-creator/patches/patch-ai
@@ -1,17 +1,17 @@
-$NetBSD: patch-ai,v 1.1.1.1 2010/05/18 19:44:02 drochner Exp $
+$NetBSD: patch-ai,v 1.2 2010/11/18 22:52:04 adam Exp $
 
---- src/plugins/debugger/gdb/gdbengine.cpp.orig	2010-01-15 17:36:52 +0000
+--- src/plugins/debugger/gdb/gdbengine.cpp.orig	2010-08-24 07:46:09.000000000 +0000
 +++ src/plugins/debugger/gdb/gdbengine.cpp
-@@ -806,7 +806,7 @@ void GdbEngine::flushCommand(const GdbCo
-         cmd.command = cmd.command.arg(currentToken());
-     gdbInputAvailable(LogInput, cmd.command);
+@@ -831,7 +831,7 @@ void GdbEngine::flushCommand(const GdbCo
+     cmd.command = QByteArray::number(currentToken()) + cmd.command;
+     showDebuggerInput(LogInput, _(cmd.command));
  
--    m_gdbAdapter->write(cmd.command.toLatin1() + "\r\n");
-+    m_gdbAdapter->write(cmd.command.toLatin1() + "\n");
+-    m_gdbAdapter->write(cmd.command + "\r\n");
++    m_gdbAdapter->write(cmd.command + "\n");
  
      m_commandTimer->start();
  
-@@ -996,7 +996,7 @@ void GdbEngine::executeDebuggerCommand(c
+@@ -1052,7 +1052,7 @@ void GdbEngine::executeDebuggerCommand(c
          return;
      }
  
diff --git a/x11/qt4-creator/patches/patch-aj b/x11/qt4-creator/patches/patch-aj
index f03e2082917..9ec0eaad1d1 100644
--- a/x11/qt4-creator/patches/patch-aj
+++ b/x11/qt4-creator/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.1.1.1 2010/05/18 19:44:02 drochner Exp $
+$NetBSD: patch-aj,v 1.2 2010/11/18 22:52:04 adam Exp $
 
---- src/plugins/projectexplorer/debugginghelper.cpp.orig	2010-01-15 17:36:52 +0000
+--- src/plugins/projectexplorer/debugginghelper.cpp.orig	2010-08-24 07:46:09.000000000 +0000
 +++ src/plugins/projectexplorer/debugginghelper.cpp
-@@ -217,7 +217,7 @@ QString DebuggingHelperLibrary::buildDeb
+@@ -231,7 +231,7 @@ QString DebuggingHelperLibrary::buildDeb
      output += newline;;
      if (!makeFullPath.isEmpty()) {
          output += QCoreApplication::translate("ProjectExplorer::DebuggingHelperLibrary", "Running %1 ...\n").arg(makeFullPath);
diff --git a/x11/qt4-creator/patches/patch-am b/x11/qt4-creator/patches/patch-am
index 7aec72e1ec7..d015389d39f 100644
--- a/x11/qt4-creator/patches/patch-am
+++ b/x11/qt4-creator/patches/patch-am
@@ -1,13 +1,13 @@
-$NetBSD: patch-am,v 1.1 2010/05/19 17:51:22 drochner Exp $
+$NetBSD: patch-am,v 1.2 2010/11/18 22:52:04 adam Exp $
 
---- src/plugins/qt4projectmanager/qt4project.cpp.orig	2010-01-15 17:36:53.000000000 +0000
-+++ src/plugins/qt4projectmanager/qt4project.cpp
-@@ -513,7 +513,7 @@ ProjectExplorer::ToolChain *Qt4Project::
- QString Qt4Project::makeCommand(BuildConfiguration *configuration) const
+--- src/plugins/qt4projectmanager/qt4buildconfiguration.cpp.orig	2010-11-18 21:19:06.000000000 +0000
++++ src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
+@@ -259,7 +259,7 @@ ProjectExplorer::ToolChain *Qt4BuildConf
+ QString Qt4BuildConfiguration::makeCommand() const
  {
-     ToolChain *tc = toolChain(configuration);
+     ToolChain *tc = toolChain();
 -    return tc ? tc->makeCommand() : "make";
 +    return tc ? tc->makeCommand() : "gmake";
  }
  
- QString Qt4Project::defaultMakeTarget(BuildConfiguration *configuration) const
+ static inline QString symbianMakeTarget(QtVersion::QmakeBuildConfigs buildConfig,
diff --git a/x11/qt4-creator/patches/patch-an b/x11/qt4-creator/patches/patch-an
index ced1bc1c48b..047d686ea53 100644
--- a/x11/qt4-creator/patches/patch-an
+++ b/x11/qt4-creator/patches/patch-an
@@ -1,13 +1,13 @@
-$NetBSD: patch-an,v 1.1 2010/05/19 17:51:23 drochner Exp $
+$NetBSD: patch-an,v 1.2 2010/11/18 22:52:04 adam Exp $
 
---- src//plugins/projectexplorer/toolchain.cpp.orig	2010-01-15 17:36:53.000000000 +0000
-+++ src//plugins/projectexplorer/toolchain.cpp
-@@ -235,7 +235,7 @@ void GccToolChain::addToEnvironment(Proj
+--- src/plugins/projectexplorer/toolchain.cpp.orig	2010-08-24 07:46:09.000000000 +0000
++++ src/plugins/projectexplorer/toolchain.cpp
+@@ -274,7 +274,7 @@ void GccToolChain::addToEnvironment(Proj
  
  QString GccToolChain::makeCommand() const
  {
--    return "make";
-+    return "gmake";
+-    return QLatin1String("make");
++    return QLatin1String("gmake");
  }
  
- bool GccToolChain::equals(ToolChain *other) const
+ IOutputParser *GccToolChain::outputParser() const
diff --git a/x11/qt4-creator/patches/patch-ao b/x11/qt4-creator/patches/patch-ao
index 01f71b38740..22f432cb6b7 100644
--- a/x11/qt4-creator/patches/patch-ao
+++ b/x11/qt4-creator/patches/patch-ao
@@ -1,9 +1,9 @@
-$NetBSD: patch-ao,v 1.1 2010/05/19 17:51:23 drochner Exp $
+$NetBSD: patch-ao,v 1.2 2010/11/18 22:52:04 adam Exp $
 
---- src/plugins/genericprojectmanager/genericmakestep.cpp.orig	2010-01-15 17:36:53.000000000 +0000
+--- src/plugins/genericprojectmanager/genericmakestep.cpp.orig	2010-08-24 07:46:09.000000000 +0000
 +++ src/plugins/genericprojectmanager/genericmakestep.cpp
-@@ -98,7 +98,7 @@ QString GenericMakeStep::makeCommand(con
-         if (ProjectExplorer::ToolChain *toolChain = m_pro->toolChain())
+@@ -160,7 +160,7 @@ QString GenericMakeStep::makeCommand() c
+         if (ProjectExplorer::ToolChain *toolChain = pro->toolChain())
              command = toolChain->makeCommand();
          else
 -            command = QLatin1String("make");
diff --git a/x11/qt4-creator/patches/patch-ap b/x11/qt4-creator/patches/patch-ap
new file mode 100644
index 00000000000..68f4e97a30c
--- /dev/null
+++ b/x11/qt4-creator/patches/patch-ap
@@ -0,0 +1,32 @@
+$NetBSD: patch-ap,v 1.1 2010/11/18 22:52:04 adam Exp $
+
+--- src/libs/3rdparty/botan/src/src.pro.orig	2010-11-18 22:36:58.000000000 +0000
++++ src/libs/3rdparty/botan/src/src.pro
+@@ -277,11 +277,8 @@ unix {
+            pubkey/eckaeg/eckaeg.h \
+            pubkey/eckaeg/eckaeg_core.h \
+            pubkey/eckaeg/eckaeg_op.h \
+-           timer/gettimeofday/tm_unix.h
+-}
+-
+-linux*-g++* {
+-    HEADERS += timer/posix_rt/tm_posix.h
++           timer/gettimeofday/tm_unix.h \
++           timer/posix_rt/tm_posix.h
+ }
+ 
+ SOURCES += algo_factory/algo_factory.cpp \
+@@ -561,11 +558,8 @@ unix {
+            pubkey/eckaeg/eckaeg.cpp \
+            pubkey/eckaeg/eckaeg_core.cpp \
+            pubkey/eckaeg/eckaeg_op.cpp \
+-           timer/gettimeofday/tm_unix.cpp
+-}
+-
+-linux*-g++* {
+-    SOURCES += timer/posix_rt/tm_posix.cpp
++           timer/gettimeofday/tm_unix.cpp \
++           timer/posix_rt/tm_posix.cpp
+ }
+ 
+ linux*-g++* {