[pkgsrc/trunk]: pkgsrc/x11 Dont default QT_NO_DBUS to on in qconfig.h to be c...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c5337aeedf32
branches:  trunk
changeset: 537405:c5337aeedf32
user:      markd <markd%pkgsrc.org@localhost>
date:      Tue Jan 08 08:35:18 2008 +0000

description:
Dont default QT_NO_DBUS to on in qconfig.h to be consistent with qt4-qdbus
package. (and therefore set it explicitly in qt4-tools)
Bump PKGREVISION of qt4-libs.

diffstat:

 x11/qt4-libs/Makefile         |   3 ++-
 x11/qt4-libs/distinfo         |   3 ++-
 x11/qt4-libs/patches/patch-aq |  16 ++++++++++++++++
 x11/qt4-tools/Makefile        |   3 ++-
 4 files changed, 22 insertions(+), 3 deletions(-)

diffs (65 lines):

diff -r 4d1c65c1c4a1 -r c5337aeedf32 x11/qt4-libs/Makefile
--- a/x11/qt4-libs/Makefile     Tue Jan 08 08:28:58 2008 +0000
+++ b/x11/qt4-libs/Makefile     Tue Jan 08 08:35:18 2008 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2007/12/17 22:19:43 adam Exp $
+# $NetBSD: Makefile,v 1.21 2008/01/08 08:35:18 markd Exp $
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=       qt4-libs-${QTVERSION}
+PKGREVISION=   1
 COMMENT=       C++ X GUI toolkit
 
 BUILD_TARGET=          sub-src
diff -r 4d1c65c1c4a1 -r c5337aeedf32 x11/qt4-libs/distinfo
--- a/x11/qt4-libs/distinfo     Tue Jan 08 08:28:58 2008 +0000
+++ b/x11/qt4-libs/distinfo     Tue Jan 08 08:35:18 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2008/01/07 21:09:05 ghen Exp $
+$NetBSD: distinfo,v 1.20 2008/01/08 08:35:18 markd Exp $
 
 SHA1 (qt-x11-opensource-src-4.3.3.tar.gz) = 77d00e2438efa793f6c16c54b64c8ba440ee3228
 RMD160 (qt-x11-opensource-src-4.3.3.tar.gz) = 410daca03b6802ba5cc6662219c2ba7a190bd292
@@ -19,3 +19,4 @@
 SHA1 (patch-an) = 6c9044134516d089e97b47a2750beab0e4c4952f
 SHA1 (patch-ao) = 04361d820325b1b8a0bc66ecaf47bab5f92e7825
 SHA1 (patch-ap) = 99402ac9ef527e7fa9b1825c8e1b8a299bc4ffe7
+SHA1 (patch-aq) = afdc1fcacc6f2f421a209d96d2c80141f1aa6dc3
diff -r 4d1c65c1c4a1 -r c5337aeedf32 x11/qt4-libs/patches/patch-aq
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt4-libs/patches/patch-aq     Tue Jan 08 08:35:18 2008 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-aq,v 1.1 2008/01/08 08:35:19 markd Exp $
+
+Dont default QT_NO_DBUS on in qconfig.h to be consistent with qt4-qdbus
+package.
+
+--- configure.orig     2007-12-05 05:42:56.000000000 +1300
++++ configure
+@@ -5281,7 +5281,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"
+ [ "$CFG_TABLET" = "no" ]     && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_TABLET"
+ [ "$CFG_IPV6" = "no" ]       && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6"
+ [ "$CFG_SXE" = "no" ]        && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE"
+-[ "$CFG_QDBUS" != "yes" ]    && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS"
++#[ "$CFG_QDBUS" != "yes" ]    && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS"
+ 
+ # X11/Unix/Mac only configs
+ [ "$CFG_CUPS" = "no" ]       && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CUPS"
diff -r 4d1c65c1c4a1 -r c5337aeedf32 x11/qt4-tools/Makefile
--- a/x11/qt4-tools/Makefile    Tue Jan 08 08:28:58 2008 +0000
+++ b/x11/qt4-tools/Makefile    Tue Jan 08 08:35:18 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/01/05 22:15:24 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2008/01/08 08:35:19 markd Exp $
 
 .include "../../x11/qt4-libs/Makefile.common"
 
@@ -9,6 +9,7 @@
 DEPENDS+=      libtool-base-[0-9]*:../../devel/libtool-base
 
 CONFIGURE_ARGS+=       -I${QTDIR}/include -L${QTDIR}/lib
+CONFIGURE_ARGS+=       -DQT_NO_DBUS
 
 BUILD_TARGET=          sub-tools