Wed Mar 23 17:26:05 2016 UTC ()
Register missing dependency on curses

Found with an unprivileged bootstrap on NetBSD/amd64 (--prefer-pkgsrc yes)


(khorben)
diff -r1.32 -r1.33 pkgsrc/x11/qt5-qtwebkit/Makefile
diff -r1.20 -r1.21 pkgsrc/x11/qt5-qtwebkit/buildlink3.mk
cvs diff -r1.32 -r1.33 pkgsrc/x11/qt5-qtwebkit/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtwebkit/Makefile 2016/03/05 11:28:01 1.32
+++ pkgsrc/x11/qt5-qtwebkit/Makefile 2016/03/23 17:26:05 1.33
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.32 2016/03/05 11:28:01 jperkin Exp $ 1# $NetBSD: Makefile,v 1.33 2016/03/23 17:26:05 khorben Exp $
2 2
3DISTNAME= qtwebkit-opensource-src-${QTVERSION} 3DISTNAME= qtwebkit-opensource-src-${QTVERSION}
4PKGNAME= qt5-qtwebkit-${QTVERSION} 4PKGNAME= qt5-qtwebkit-${QTVERSION}
5PKGREVISION= 3 5PKGREVISION= 3
6COMMENT= Qt5 WebView module 6COMMENT= Qt5 WebView module
7 7
8BUILD_DEPENDS+= gperf-[0-9]*:../../devel/gperf 8BUILD_DEPENDS+= gperf-[0-9]*:../../devel/gperf
9 9
10USE_TOOLS+= bison flex pkg-config sed 10USE_TOOLS+= bison flex pkg-config sed
11REPLACE_PERL+= Source/WebKit2/Scripts/generate-forwarding-headers.pl 11REPLACE_PERL+= Source/WebKit2/Scripts/generate-forwarding-headers.pl
12 12
13MAKE_ENV+= QTDIR=${QTDIR} 13MAKE_ENV+= QTDIR=${QTDIR}
14INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 14INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
@@ -27,26 +27,27 @@ LDFLAGS+= -Wl,-no-keep-memory -Wl-reduce @@ -27,26 +27,27 @@ LDFLAGS+= -Wl,-no-keep-memory -Wl-reduce
27.endif 27.endif
28 28
29post-install: 29post-install:
30.for i in Qt5WebKit.pc Qt5WebKitWidgets.pc 30.for i in Qt5WebKit.pc Qt5WebKitWidgets.pc
31 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ 31 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
32 ln -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} 32 ln -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
33.endfor 33.endfor
34 34
35.include "../../databases/sqlite3/buildlink3.mk" 35.include "../../databases/sqlite3/buildlink3.mk"
36.if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD" 36.if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD"
37.include "../../devel/libexecinfo/buildlink3.mk" 37.include "../../devel/libexecinfo/buildlink3.mk"
38.endif 38.endif
39.include "../../graphics/libwebp/buildlink3.mk" 39.include "../../graphics/libwebp/buildlink3.mk"
 40.include "../../mk/curses.buildlink3.mk"
40.include "../../textproc/icu/buildlink3.mk" 41.include "../../textproc/icu/buildlink3.mk"
41.include "../../textproc/libxslt/buildlink3.mk" 42.include "../../textproc/libxslt/buildlink3.mk"
42.if ${OPSYS} != "Darwin" 43.if ${OPSYS} != "Darwin"
43.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" 44.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
44.include "../../x11/libXcomposite/buildlink3.mk" 45.include "../../x11/libXcomposite/buildlink3.mk"
45.endif 46.endif
46.include "../../x11/qt5-qtdeclarative/buildlink3.mk" 47.include "../../x11/qt5-qtdeclarative/buildlink3.mk"
47.include "../../x11/qt5-qtlocation/buildlink3.mk" 48.include "../../x11/qt5-qtlocation/buildlink3.mk"
48.include "../../x11/qt5-qtmultimedia/buildlink3.mk" 49.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
49.include "../../x11/qt5-qtsensors/buildlink3.mk" 50.include "../../x11/qt5-qtsensors/buildlink3.mk"
50.include "../../x11/qt5-qtwebchannel/buildlink3.mk" 51.include "../../x11/qt5-qtwebchannel/buildlink3.mk"
51PYTHON_FOR_BUILD_ONLY= yes 52PYTHON_FOR_BUILD_ONLY= yes
52.include "../../lang/python/tool.mk" 53.include "../../lang/python/tool.mk"
cvs diff -r1.20 -r1.21 pkgsrc/x11/qt5-qtwebkit/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtwebkit/buildlink3.mk 2016/03/05 11:28:01 1.20
+++ pkgsrc/x11/qt5-qtwebkit/buildlink3.mk 2016/03/23 17:26:05 1.21
@@ -1,30 +1,31 @@ @@ -1,30 +1,31 @@
1# $NetBSD: buildlink3.mk,v 1.20 2016/03/05 11:28:01 jperkin Exp $ 1# $NetBSD: buildlink3.mk,v 1.21 2016/03/23 17:26:05 khorben Exp $
2 2
3BUILDLINK_TREE+= qt5-qtwebkit 3BUILDLINK_TREE+= qt5-qtwebkit
4 4
5.if !defined(QT5_QTWEBKIT_BUILDLINK3_MK) 5.if !defined(QT5_QTWEBKIT_BUILDLINK3_MK)
6QT5_QTWEBKIT_BUILDLINK3_MK:= 6QT5_QTWEBKIT_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.qt5-qtwebkit+= qt5-qtwebkit>=5.5.1 8BUILDLINK_API_DEPENDS.qt5-qtwebkit+= qt5-qtwebkit>=5.5.1
9BUILDLINK_ABI_DEPENDS.qt5-qtwebkit+= qt5-qtwebkit>=5.5.1nb3 9BUILDLINK_ABI_DEPENDS.qt5-qtwebkit+= qt5-qtwebkit>=5.5.1nb3
10BUILDLINK_PKGSRCDIR.qt5-qtwebkit?= ../../x11/qt5-qtwebkit 10BUILDLINK_PKGSRCDIR.qt5-qtwebkit?= ../../x11/qt5-qtwebkit
11 11
12BUILDLINK_INCDIRS.qt5-qtwebkit+= qt5/include 12BUILDLINK_INCDIRS.qt5-qtwebkit+= qt5/include
13BUILDLINK_LIBDIRS.qt5-qtwebkit+= qt5/lib 13BUILDLINK_LIBDIRS.qt5-qtwebkit+= qt5/lib
14BUILDLINK_LIBDIRS.qt5-qtwebkit+= qt5/plugins 14BUILDLINK_LIBDIRS.qt5-qtwebkit+= qt5/plugins
15 15
16.include "../../databases/sqlite3/buildlink3.mk" 16.include "../../databases/sqlite3/buildlink3.mk"
17.include "../../graphics/libwebp/buildlink3.mk" 17.include "../../graphics/libwebp/buildlink3.mk"
 18.include "../../mk/curses.buildlink3.mk"
18.include "../../textproc/libxslt/buildlink3.mk" 19.include "../../textproc/libxslt/buildlink3.mk"
19.if ${OPSYS} != "Darwin" 20.if ${OPSYS} != "Darwin"
20.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" 21.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
21.include "../../x11/libXcomposite/buildlink3.mk" 22.include "../../x11/libXcomposite/buildlink3.mk"
22.endif 23.endif
23.include "../../x11/qt5-qtdeclarative/buildlink3.mk" 24.include "../../x11/qt5-qtdeclarative/buildlink3.mk"
24.include "../../x11/qt5-qtlocation/buildlink3.mk" 25.include "../../x11/qt5-qtlocation/buildlink3.mk"
25.include "../../x11/qt5-qtmultimedia/buildlink3.mk" 26.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
26.include "../../x11/qt5-qtsensors/buildlink3.mk" 27.include "../../x11/qt5-qtsensors/buildlink3.mk"
27.include "../../x11/qt5-qtwebchannel/buildlink3.mk" 28.include "../../x11/qt5-qtwebchannel/buildlink3.mk"
28PYTHON_FOR_BUILD_ONLY= yes 29PYTHON_FOR_BUILD_ONLY= yes
29.include "../../lang/python/tool.mk" 30.include "../../lang/python/tool.mk"
30.include "../../lang/ruby/buildlink3.mk" 31.include "../../lang/ruby/buildlink3.mk"