[pkgsrc/trunk]: pkgsrc/x11/qt4-creator minor improvements:

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/270221462abd
branches:  trunk
changeset: 575671:270221462abd
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Wed May 19 17:51:22 2010 +0000

description:
minor improvements:
-install some "style" definitions
-use "gmake" as default make tool -- the build process depends
 on gnumake's "-w" flag (can be adjusted in project properties, but this
 way it works out of the box)
bump PKGREVISION

diffstat:

 x11/qt4-creator/Makefile         |   7 ++++---
 x11/qt4-creator/PLIST            |   5 ++++-
 x11/qt4-creator/distinfo         |   5 ++++-
 x11/qt4-creator/patches/patch-am |  13 +++++++++++++
 x11/qt4-creator/patches/patch-an |  13 +++++++++++++
 x11/qt4-creator/patches/patch-ao |  13 +++++++++++++
 6 files changed, 51 insertions(+), 5 deletions(-)

diffs (114 lines):

diff -r 2adad3ab58a9 -r 270221462abd x11/qt4-creator/Makefile
--- a/x11/qt4-creator/Makefile  Wed May 19 13:00:08 2010 +0000
+++ b/x11/qt4-creator/Makefile  Wed May 19 17:51:22 2010 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/05/18 19:44:01 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2010/05/19 17:51:22 drochner Exp $
 #
 
 DISTNAME=      qt-creator-1.3.1-src
 PKGNAME=       qt4-creator-1.3.1
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  http://get.qt.nokia.com/qtcreator/
 
@@ -53,11 +54,11 @@
        ${INSTALL_DATA} ${WRKSRC}/share/qtcreator/translations/*.qm \
                ${DESTDIR}${PREFIX}/share/qtcreator/translations/
        cd ${WRKSRC}/share/qtcreator && ${FIND} designer gdbmacros \
-               schemes snippets templates -type d -exec \
+               schemes snippets styles templates -type d -exec \
                 ${INSTALL_DATA_DIR} "${WRKSRC}/share/qtcreator/{}" \
                "${DESTDIR}${PREFIX}/share/qtcreator/{}" ";"
        cd ${WRKSRC}/share/qtcreator && ${FIND} designer gdbmacros \
-               schemes snippets templates -type f \! -name "*.orig" -exec \
+               schemes snippets styles templates -type f \! -name "*.orig" -exec \
                 ${INSTALL_DATA} "${WRKSRC}/share/qtcreator/{}" \
                "${DESTDIR}${PREFIX}/share/qtcreator/{}" ";"
 
diff -r 2adad3ab58a9 -r 270221462abd x11/qt4-creator/PLIST
--- a/x11/qt4-creator/PLIST     Wed May 19 13:00:08 2010 +0000
+++ b/x11/qt4-creator/PLIST     Wed May 19 17:51:22 2010 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/05/18 19:44:01 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2010/05/19 17:51:22 drochner Exp $
 bin/qtcreator
 bin/qtcreator_process_stub
 lib/qtcreator/libAggregation.la
@@ -94,6 +94,9 @@
 share/qtcreator/snippets/foreach.snp
 share/qtcreator/snippets/if.snp
 share/qtcreator/snippets/ifelse.snp
+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
 share/qtcreator/templates/qt4project/customwidgetwizard/tpl_plugin.pro
diff -r 2adad3ab58a9 -r 270221462abd x11/qt4-creator/distinfo
--- a/x11/qt4-creator/distinfo  Wed May 19 13:00:08 2010 +0000
+++ b/x11/qt4-creator/distinfo  Wed May 19 17:51:22 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/05/18 19:44:02 drochner Exp $
+$NetBSD: distinfo,v 1.2 2010/05/19 17:51:22 drochner Exp $
 
 SHA1 (qt-creator-1.3.1-src.tar.gz) = 49b61c3e8010d94d6d595fef38d3da737b26cd80
 RMD160 (qt-creator-1.3.1-src.tar.gz) = 37bebc4566cfef85d5a7901c1efd8b917b3a0584
@@ -15,3 +15,6 @@
 SHA1 (patch-aj) = 82e4a688fc287e08c0c425d601e78f95252d5011
 SHA1 (patch-ak) = 5c33cd0733f84c850856bf7c178fdb0596e1592b
 SHA1 (patch-al) = b8e116a70ec00c4b5bb50f5c2181d438e81de54f
+SHA1 (patch-am) = e57f6240c0f3eda90c4fe34b4299b7b453b84008
+SHA1 (patch-an) = 3ad25e76cd7b504175e879bbd5ee72f886cfc338
+SHA1 (patch-ao) = 37183d831e12d4e49ae6f96619fa56febf41afa8
diff -r 2adad3ab58a9 -r 270221462abd x11/qt4-creator/patches/patch-am
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt4-creator/patches/patch-am  Wed May 19 17:51:22 2010 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2010/05/19 17:51:22 drochner 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
+ {
+     ToolChain *tc = toolChain(configuration);
+-    return tc ? tc->makeCommand() : "make";
++    return tc ? tc->makeCommand() : "gmake";
+ }
+ 
+ QString Qt4Project::defaultMakeTarget(BuildConfiguration *configuration) const
diff -r 2adad3ab58a9 -r 270221462abd x11/qt4-creator/patches/patch-an
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt4-creator/patches/patch-an  Wed May 19 17:51:22 2010 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2010/05/19 17:51:23 drochner 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
+ 
+ QString GccToolChain::makeCommand() const
+ {
+-    return "make";
++    return "gmake";
+ }
+ 
+ bool GccToolChain::equals(ToolChain *other) const
diff -r 2adad3ab58a9 -r 270221462abd x11/qt4-creator/patches/patch-ao
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt4-creator/patches/patch-ao  Wed May 19 17:51:22 2010 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1 2010/05/19 17:51:23 drochner Exp $
+
+--- src/plugins/genericprojectmanager/genericmakestep.cpp.orig 2010-01-15 17:36:53.000000000 +0000
++++ src/plugins/genericprojectmanager/genericmakestep.cpp
+@@ -98,7 +98,7 @@ QString GenericMakeStep::makeCommand(con
+         if (ProjectExplorer::ToolChain *toolChain = m_pro->toolChain())
+             command = toolChain->makeCommand();
+         else
+-            command = QLatin1String("make");
++            command = QLatin1String("gmake");
+     }
+     return command;
+ }