Sun Aug 10 13:24:54 2014 UTC ()
Include libexecinfo/bl3.mk on Darwin, Linux, and NetBSD.
(Compare x11/qt5-qtbase/patches/patch-qtwebkit_Source_WTF_wtf_Assertions.cpp)
>From Niclas Rosenvik in PR 48609.
Bump PKGREVISION.


(wiz)
diff -r1.13 -r1.14 pkgsrc/x11/qt5-qtwebkit/Makefile
cvs diff -r1.13 -r1.14 pkgsrc/x11/qt5-qtwebkit/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtwebkit/Makefile 2014/07/27 23:04:30 1.13
+++ pkgsrc/x11/qt5-qtwebkit/Makefile 2014/08/10 13:24:54 1.14
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.13 2014/07/27 23:04:30 jperkin Exp $ 1# $NetBSD: Makefile,v 1.14 2014/08/10 13:24:54 wiz Exp $
2 2
3PKGNAME= qt5-qtwebkit-${QTVERSION} 3PKGNAME= qt5-qtwebkit-${QTVERSION}
 4PKGREVISION= 1
4COMMENT= Qt5 WebView module 5COMMENT= Qt5 WebView module
5 6
6.include "../../x11/qt5-qtbase/Makefile.common" 7.include "../../x11/qt5-qtbase/Makefile.common"
7 8
8BUILD_DEPENDS+= gperf-[0-9]*:../../devel/gperf 9BUILD_DEPENDS+= gperf-[0-9]*:../../devel/gperf
9 10
10USE_LIBTOOL= yes 11USE_LIBTOOL= yes
11USE_TOOLS+= bison flex pkg-config sed 12USE_TOOLS+= bison flex pkg-config sed
12 13
13BUILD_DIRS= qtwebkit 14BUILD_DIRS= qtwebkit
14MAKE_ENV+= QTDIR=${QTDIR} 15MAKE_ENV+= QTDIR=${QTDIR}
15 16
16INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 17INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
@@ -37,26 +38,29 @@ post-install: @@ -37,26 +38,29 @@ post-install:
37 | ${SED} -e 's/-lANGLE //' \ 38 | ${SED} -e 's/-lANGLE //' \
38 | ${SED} -e 's/-lJavaScriptCore //' \ 39 | ${SED} -e 's/-lJavaScriptCore //' \
39 | ${SED} -e 's/-lWTF //' \ 40 | ${SED} -e 's/-lWTF //' \
40 > ${DESTDIR}${PREFIX}/${i} 41 > ${DESTDIR}${PREFIX}/${i}
41 ${RM} -f ${DESTDIR}${PREFIX}/${i}.1 42 ${RM} -f ${DESTDIR}${PREFIX}/${i}.1
42.endfor 43.endfor
43.for i in ${QTPKGCONFIGPC} 44.for i in ${QTPKGCONFIGPC}
44 ${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${i} && \ 45 ${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${i} && \
45 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ 46 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
46 ln -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} 47 ln -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
47.endfor 48.endfor
48 49
49.include "../../databases/sqlite3/buildlink3.mk" 50.include "../../databases/sqlite3/buildlink3.mk"
 51.if ${OPSYS} = "Darwin" || ${OPSYS} = "Linux" || ${OPSYS} = "NetBSD"
 52.include "../../devel/libexecinfo/buildlink3.mk"
 53.endif
50.include "../../fonts/fontconfig/buildlink3.mk" 54.include "../../fonts/fontconfig/buildlink3.mk"
51.include "../../graphics/libwebp/buildlink3.mk" 55.include "../../graphics/libwebp/buildlink3.mk"
52.include "../../graphics/png/buildlink3.mk" 56.include "../../graphics/png/buildlink3.mk"
53.include "../../mk/jpeg.buildlink3.mk" 57.include "../../mk/jpeg.buildlink3.mk"
54.include "../../textproc/libxslt/buildlink3.mk" 58.include "../../textproc/libxslt/buildlink3.mk"
55.if ${OPSYS} != "Darwin" 59.if ${OPSYS} != "Darwin"
56.include "../../graphics/MesaLib/buildlink3.mk" 60.include "../../graphics/MesaLib/buildlink3.mk"
57.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" 61.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
58.include "../../x11/libXcomposite/buildlink3.mk" 62.include "../../x11/libXcomposite/buildlink3.mk"
59.endif 63.endif
60.include "../../x11/qt5-qtdeclarative/buildlink3.mk" 64.include "../../x11/qt5-qtdeclarative/buildlink3.mk"
61.include "../../x11/qt5-qtlocation/buildlink3.mk" 65.include "../../x11/qt5-qtlocation/buildlink3.mk"
62.include "../../x11/qt5-qtmultimedia/buildlink3.mk" 66.include "../../x11/qt5-qtmultimedia/buildlink3.mk"