[pkgsrc/trunk]: pkgsrc/x11 make that the "silent" qmake feature flag is silen...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3b037c99dae4
branches:  trunk
changeset: 579480:3b037c99dae4
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Fri Sep 03 13:47:12 2010 +0000

description:
make that the "silent" qmake feature flag is silently ignored, it is
incompatible with the way libtool support was hacked in (we were getting
something like "libtool --mode=compile echo compiling foo && cc foo.c ...")
bump PKGREVISION

diffstat:

 x11/qt4-libs/distinfo         |   3 ++-
 x11/qt4-libs/patches/patch-ca |  18 ++++++++++++++++++
 x11/qt4-tools/Makefile        |   4 +++-
 3 files changed, 23 insertions(+), 2 deletions(-)

diffs (52 lines):

diff -r a1848712c7de -r 3b037c99dae4 x11/qt4-libs/distinfo
--- a/x11/qt4-libs/distinfo     Fri Sep 03 10:46:10 2010 +0000
+++ b/x11/qt4-libs/distinfo     Fri Sep 03 13:47:12 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.45 2010/07/04 06:00:14 adam Exp $
+$NetBSD: distinfo,v 1.46 2010/09/03 13:47:12 drochner Exp $
 
 SHA1 (qt-everywhere-opensource-src-4.6.3.tar.gz) = 1c18a564df9296c7cb0e0dedde40b9843e1b30e8
 RMD160 (qt-everywhere-opensource-src-4.6.3.tar.gz) = ceb3ca78263d0d9cdf92fef903e30c0026db6bff
@@ -31,3 +31,4 @@
 SHA1 (patch-az) = 8c8cf4f77b28d092ce05ab2d4a8a87d1a22c61a1
 SHA1 (patch-ba) = 3fbe444ec924b9185f845cbcc90f4a799aaf59ae
 SHA1 (patch-bb) = 9f82a7ac9f951a033af6ae78201ccd8d00004d42
+SHA1 (patch-ca) = 8b69cb6201f624f43df7d766ff1967253bb22430
diff -r a1848712c7de -r 3b037c99dae4 x11/qt4-libs/patches/patch-ca
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt4-libs/patches/patch-ca     Fri Sep 03 13:47:12 2010 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-ca,v 1.3 2010/09/03 13:47:12 drochner Exp $
+
+--- mkspecs/features/silent.prf.orig   2010-06-02 02:03:08.000000000 +0000
++++ mkspecs/features/silent.prf
+@@ -1,6 +1,7 @@
+-!macx-xcode {
+-    QMAKE_CC = @echo compiling $< && $$QMAKE_CC
+-    QMAKE_CXX = @echo compiling $< && $$QMAKE_CXX
+-    !contains(QMAKE_LINK, "@:"):QMAKE_LINK = @echo linking $@ && $$QMAKE_LINK
+-    QMAKE_LINK_SHLIB = @echo linking $@ && $$QMAKE_LINK_SHLIB
+-}
++# XXX ignore -- incompatible with libtool usage
++#!macx-xcode {
++#    QMAKE_CC = @echo compiling $< && $$QMAKE_CC
++#    QMAKE_CXX = @echo compiling $< && $$QMAKE_CXX
++#    !contains(QMAKE_LINK, "@:"):QMAKE_LINK = @echo linking $@ && $$QMAKE_LINK
++#    QMAKE_LINK_SHLIB = @echo linking $@ && $$QMAKE_LINK_SHLIB
++#}
diff -r a1848712c7de -r 3b037c99dae4 x11/qt4-tools/Makefile
--- a/x11/qt4-tools/Makefile    Fri Sep 03 10:46:10 2010 +0000
+++ b/x11/qt4-tools/Makefile    Fri Sep 03 13:47:12 2010 +0000
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.33 2010/07/04 06:00:15 adam Exp $
+# $NetBSD: Makefile,v 1.34 2010/09/03 13:47:12 drochner Exp $
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
 
+PKGREVISION=   1
+
 PKGNAME=       qt4-tools-${QTVERSION}
 COMMENT=       QT GUI (WYSIWYG) builder and other tools