[pkgsrc/trunk]: pkgsrc/x11/qt5-qtwebkit If x11/qt5-qtwebchannel is installed ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7042159b2fb1
branches:  trunk
changeset: 650178:7042159b2fb1
user:      nros <nros%pkgsrc.org@localhost>
date:      Sun Apr 19 14:50:11 2015 +0000

description:
If x11/qt5-qtwebchannel is installed qtwebkit finds it during configure
and tries to use it and the build breaks. Make x11/qt5-qtwebchannel a
dependecy to qtwebkit to fix this.
Bump pkgrevision.

diffstat:

 x11/qt5-qtwebkit/Makefile      |  5 +++--
 x11/qt5-qtwebkit/buildlink3.mk |  5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (48 lines):

diff -r af1d55d058cb -r 7042159b2fb1 x11/qt5-qtwebkit/Makefile
--- a/x11/qt5-qtwebkit/Makefile Sun Apr 19 14:31:06 2015 +0000
+++ b/x11/qt5-qtwebkit/Makefile Sun Apr 19 14:50:11 2015 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2015/04/06 08:17:20 adam Exp $
+# $NetBSD: Makefile,v 1.26 2015/04/19 14:50:11 nros Exp $
 
 DISTNAME=      qtwebkit-opensource-src-${QTVERSION}
 PKGNAME=       qt5-qtwebkit-${QTVERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 COMMENT=       Qt5 WebView module
 
 BUILD_DEPENDS+=                gperf-[0-9]*:../../devel/gperf
@@ -47,6 +47,7 @@
 .include "../../x11/qt5-qtlocation/buildlink3.mk"
 .include "../../x11/qt5-qtmultimedia/buildlink3.mk"
 .include "../../x11/qt5-qtsensors/buildlink3.mk"
+.include "../../x11/qt5-qtwebchannel/buildlink3.mk"
 PYTHON_FOR_BUILD_ONLY=                 yes
 .include "../../lang/python/tool.mk"
 .include "../../lang/ruby/buildlink3.mk"
diff -r af1d55d058cb -r 7042159b2fb1 x11/qt5-qtwebkit/buildlink3.mk
--- a/x11/qt5-qtwebkit/buildlink3.mk    Sun Apr 19 14:31:06 2015 +0000
+++ b/x11/qt5-qtwebkit/buildlink3.mk    Sun Apr 19 14:50:11 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2015/04/06 08:17:20 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2015/04/19 14:50:11 nros Exp $
 
 BUILDLINK_TREE+=       qt5-qtwebkit
 
@@ -6,7 +6,7 @@
 QT5_QTWEBKIT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qt5-qtwebkit+=   qt5-qtwebkit>=5.4.0
-BUILDLINK_ABI_DEPENDS.qt5-qtwebkit+=   qt5-qtwebkit>=5.4.0nb2
+BUILDLINK_ABI_DEPENDS.qt5-qtwebkit+=   qt5-qtwebkit>=5.4.0nb3
 BUILDLINK_PKGSRCDIR.qt5-qtwebkit?=     ../../x11/qt5-qtwebkit
 
 BUILDLINK_INCDIRS.qt5-qtwebkit+=       qt5/include
@@ -24,6 +24,7 @@
 .include "../../x11/qt5-qtlocation/buildlink3.mk"
 .include "../../x11/qt5-qtmultimedia/buildlink3.mk"
 .include "../../x11/qt5-qtsensors/buildlink3.mk"
+.include "../../x11/qt5-qtwebchannel/buildlink3.mk"
 PYTHON_FOR_BUILD_ONLY=                 yes
 .include "../../lang/python/tool.mk"
 .include "../../lang/ruby/buildlink3.mk"