Sun Nov 29 22:33:24 2020 UTC ()
x11/qt5-*: avoid calling install_name_tool on symlinks
otherwise, it converts symlinks to copies which creates
problems with duplicate dylibs at runtime


(dbj)
diff -r1.48 -r1.49 pkgsrc/x11/qt5-mysql/Makefile
diff -r1.49 -r1.50 pkgsrc/x11/qt5-odbc/Makefile
diff -r1.51 -r1.52 pkgsrc/x11/qt5-psql/Makefile
diff -r1.104 -r1.105 pkgsrc/x11/qt5-qtbase/Makefile
diff -r1.45 -r1.46 pkgsrc/x11/qt5-qtbase/Makefile.common
diff -r1.21 -r1.22 pkgsrc/x11/qt5-qtcharts/Makefile
diff -r1.17 -r1.18 pkgsrc/x11/qt5-qtconnectivity/Makefile
diff -r1.55 -r1.56 pkgsrc/x11/qt5-qtdeclarative/Makefile
diff -r1.63 -r1.64 pkgsrc/x11/qt5-qtdoc/Makefile
diff -r1.47 -r1.48 pkgsrc/x11/qt5-qtgraphicaleffects/Makefile
diff -r1.51 -r1.52 pkgsrc/x11/qt5-qtimageformats/Makefile
diff -r1.51 -r1.52 pkgsrc/x11/qt5-qtlocation/Makefile
diff -r1.42 -r1.43 pkgsrc/x11/qt5-qtmacextras/Makefile
diff -r1.72 -r1.73 pkgsrc/x11/qt5-qtmultimedia/Makefile
diff -r1.21 -r1.22 pkgsrc/x11/qt5-qtnetworkauth/Makefile
diff -r1.47 -r1.48 pkgsrc/x11/qt5-qtquickcontrols/Makefile
diff -r1.29 -r1.30 pkgsrc/x11/qt5-qtquickcontrols2/Makefile
diff -r1.64 -r1.65 pkgsrc/x11/qt5-qtscript/Makefile
diff -r1.13 -r1.14 pkgsrc/x11/qt5-qtscxml/Makefile
diff -r1.50 -r1.51 pkgsrc/x11/qt5-qtsensors/Makefile
diff -r1.48 -r1.49 pkgsrc/x11/qt5-qtserialport/Makefile
diff -r1.16 -r1.17 pkgsrc/x11/qt5-qtspeech/Makefile
diff -r1.48 -r1.49 pkgsrc/x11/qt5-qtsvg/Makefile
diff -r1.71 -r1.72 pkgsrc/x11/qt5-qttools/Makefile
diff -r1.63 -r1.64 pkgsrc/x11/qt5-qttranslations/Makefile
diff -r1.13 -r1.14 pkgsrc/x11/qt5-qtvirtualkeyboard/Makefile
diff -r1.16 -r1.17 pkgsrc/x11/qt5-qtwayland/Makefile
diff -r1.44 -r1.45 pkgsrc/x11/qt5-qtwebchannel/Makefile
diff -r1.42 -r1.43 pkgsrc/x11/qt5-qtwebsockets/Makefile
diff -r1.48 -r1.49 pkgsrc/x11/qt5-qtx11extras/Makefile
diff -r1.48 -r1.49 pkgsrc/x11/qt5-qtxmlpatterns/Makefile
cvs diff -r1.48 -r1.49 pkgsrc/x11/qt5-mysql/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-mysql/Makefile 2020/11/21 11:22:31 1.48
+++ pkgsrc/x11/qt5-mysql/Makefile 2020/11/29 22:33:21 1.49
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.48 2020/11/21 11:22:31 adam Exp $ 1# $NetBSD: Makefile,v 1.49 2020/11/29 22:33:21 dbj Exp $
2 2
3DISTNAME= qtbase-everywhere-src-${QTVERSION} 3DISTNAME= qtbase-everywhere-src-${QTVERSION}
4PKGNAME= qt5-mysql-${QTVERSION} 4PKGNAME= qt5-mysql-${QTVERSION}
 5PKGREVISION= 1
5COMMENT= Qt5 MySQL plugin 6COMMENT= Qt5 MySQL plugin
6 7
7CFLAGS+= -I${BUILDLINK_PREFIX.mysql-client}/include/mysql 8CFLAGS+= -I${BUILDLINK_PREFIX.mysql-client}/include/mysql
8 9
9BUILD_DIRS= src/plugins/sqldrivers 10BUILD_DIRS= src/plugins/sqldrivers
10MAKE_ENV+= QTDIR=${QTDIR} 11MAKE_ENV+= QTDIR=${QTDIR}
11INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 12INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
12 13
13.include "../../x11/qt5-qtbase/Makefile.common" 14.include "../../x11/qt5-qtbase/Makefile.common"
14 15
15do-configure: 16do-configure:
16 ${RM} -f -r ${WRKSRC}/mkspecs 17 ${RM} -f -r ${WRKSRC}/mkspecs
17 cd ${WRKSRC}/${BUILD_DIRS} && \ 18 cd ${WRKSRC}/${BUILD_DIRS} && \
cvs diff -r1.49 -r1.50 pkgsrc/x11/qt5-odbc/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-odbc/Makefile 2020/11/21 11:22:31 1.49
+++ pkgsrc/x11/qt5-odbc/Makefile 2020/11/29 22:33:21 1.50
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.49 2020/11/21 11:22:31 adam Exp $ 1# $NetBSD: Makefile,v 1.50 2020/11/29 22:33:21 dbj Exp $
2 2
3DISTNAME= qtbase-everywhere-src-${QTVERSION} 3DISTNAME= qtbase-everywhere-src-${QTVERSION}
4PKGNAME= qt5-odbc-${QTVERSION} 4PKGNAME= qt5-odbc-${QTVERSION}
 5PKGREVISION= 1
5COMMENT= Qt5 odbc plugin 6COMMENT= Qt5 odbc plugin
6 7
7BUILD_DIRS= src/plugins/sqldrivers 8BUILD_DIRS= src/plugins/sqldrivers
8MAKE_ENV+= QTDIR=${QTDIR} 9MAKE_ENV+= QTDIR=${QTDIR}
9INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 10INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
10 11
11LIBS+= -lltdl 12LIBS+= -lltdl
12 13
13.include "../../x11/qt5-qtbase/Makefile.common" 14.include "../../x11/qt5-qtbase/Makefile.common"
14 15
15do-configure: 16do-configure:
16 ${RM} -f -r ${WRKSRC}/mkspecs 17 ${RM} -f -r ${WRKSRC}/mkspecs
17 cd ${WRKSRC}/${BUILD_DIRS} && \ 18 cd ${WRKSRC}/${BUILD_DIRS} && \
cvs diff -r1.51 -r1.52 pkgsrc/x11/qt5-psql/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-psql/Makefile 2020/11/21 11:22:31 1.51
+++ pkgsrc/x11/qt5-psql/Makefile 2020/11/29 22:33:21 1.52
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.51 2020/11/21 11:22:31 adam Exp $ 1# $NetBSD: Makefile,v 1.52 2020/11/29 22:33:21 dbj Exp $
2 2
3DISTNAME= qtbase-everywhere-src-${QTVERSION} 3DISTNAME= qtbase-everywhere-src-${QTVERSION}
4PKGNAME= qt5-psql-${QTVERSION} 4PKGNAME= qt5-psql-${QTVERSION}
 5PKGREVISION= 1
5COMMENT= Qt5 PostgreSQL plugin 6COMMENT= Qt5 PostgreSQL plugin
6 7
7BUILD_QT5= yes 8BUILD_QT5= yes
8 9
9BUILD_DIRS= src/plugins/sqldrivers 10BUILD_DIRS= src/plugins/sqldrivers
10MAKE_ENV+= QTDIR=${QTDIR} 11MAKE_ENV+= QTDIR=${QTDIR}
11INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 12INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
12 13
13.include "../../x11/qt5-qtbase/Makefile.common" 14.include "../../x11/qt5-qtbase/Makefile.common"
14 15
15do-configure: 16do-configure:
16 ${RM} -f -r ${WRKSRC}/mkspecs 17 ${RM} -f -r ${WRKSRC}/mkspecs
17 cd ${WRKSRC}/${BUILD_DIRS} && \ 18 cd ${WRKSRC}/${BUILD_DIRS} && \
cvs diff -r1.104 -r1.105 pkgsrc/x11/qt5-qtbase/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtbase/Makefile 2020/11/21 11:22:31 1.104
+++ pkgsrc/x11/qt5-qtbase/Makefile 2020/11/29 22:33:21 1.105
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.104 2020/11/21 11:22:31 adam Exp $ 1# $NetBSD: Makefile,v 1.105 2020/11/29 22:33:21 dbj Exp $
2 2
3DISTNAME= qtbase-everywhere-src-${QTVERSION} 3DISTNAME= qtbase-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtbase-${QTVERSION} 4PKGNAME= qt5-qtbase-${QTVERSION}
 5PKGREVISION= 1
5COMMENT= C++ X GUI toolkit 6COMMENT= C++ X GUI toolkit
6 7
7.include "../../x11/qt5-qtbase/Makefile.common" 8.include "../../x11/qt5-qtbase/Makefile.common"
8 9
9HAS_CONFIGURE= yes 10HAS_CONFIGURE= yes
10CONFIGURE_ARGS+= -prefix "${QTPREFIX}" 11CONFIGURE_ARGS+= -prefix "${QTPREFIX}"
11CONFIGURE_ARGS+= -I "${PREFIX}/include" 12CONFIGURE_ARGS+= -I "${PREFIX}/include"
12CONFIGURE_ARGS+= -L "${PREFIX}/lib" 13CONFIGURE_ARGS+= -L "${PREFIX}/lib"
13CONFIGURE_ARGS+= -opensource -confirm-license 14CONFIGURE_ARGS+= -opensource -confirm-license
14CONFIGURE_ARGS+= -sysconfdir "${PKG_SYSCONFDIR}/xdg" 15CONFIGURE_ARGS+= -sysconfdir "${PKG_SYSCONFDIR}/xdg"
15CONFIGURE_ARGS+= -accessibility 16CONFIGURE_ARGS+= -accessibility
16CONFIGURE_ARGS+= -icu 17CONFIGURE_ARGS+= -icu
17CONFIGURE_ARGS+= -libproxy 18CONFIGURE_ARGS+= -libproxy
cvs diff -r1.45 -r1.46 pkgsrc/x11/qt5-qtbase/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtbase/Makefile.common 2020/11/29 22:32:17 1.45
+++ pkgsrc/x11/qt5-qtbase/Makefile.common 2020/11/29 22:33:21 1.46
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.45 2020/11/29 22:32:17 dbj Exp $ 1# $NetBSD: Makefile.common,v 1.46 2020/11/29 22:33:21 dbj Exp $
2# used by x11/qt5-mysql/Makefile 2# used by x11/qt5-mysql/Makefile
3# used by x11/qt5-odbc/Makefile 3# used by x11/qt5-odbc/Makefile
4# used by x11/qt5-psql/Makefile 4# used by x11/qt5-psql/Makefile
5# used by x11/qt5-qtbase/Makefile 5# used by x11/qt5-qtbase/Makefile
6# used by x11/qt5-qtcharts/Makefile 6# used by x11/qt5-qtcharts/Makefile
7# used by x11/qt5-qtconnectivity/Makefile 7# used by x11/qt5-qtconnectivity/Makefile
8# used by x11/qt5-qtdeclarative/Makefile 8# used by x11/qt5-qtdeclarative/Makefile
9# used by x11/qt5-qtdoc/Makefile 9# used by x11/qt5-qtdoc/Makefile
10# used by x11/qt5-qtgraphicaleffects/Makefile 10# used by x11/qt5-qtgraphicaleffects/Makefile
11# used by x11/qt5-qtimageformats/Makefile 11# used by x11/qt5-qtimageformats/Makefile
12# used by x11/qt5-qtlocation/Makefile 12# used by x11/qt5-qtlocation/Makefile
13# used by x11/qt5-qtmacextras/Makefile 13# used by x11/qt5-qtmacextras/Makefile
14# used by x11/qt5-qtmultimedia/Makefile 14# used by x11/qt5-qtmultimedia/Makefile
@@ -67,20 +67,20 @@ PLIST.notdarwin= yes @@ -67,20 +67,20 @@ PLIST.notdarwin= yes
67SCRIPTS_ENV+= HOME=${WRKDIR} 67SCRIPTS_ENV+= HOME=${WRKDIR}
68 68
69.if "${PKGPATH}" != "x11/qt5-qtbase" && "${PKGPATH}" != "x11/qt5-odbc" && \ 69.if "${PKGPATH}" != "x11/qt5-qtbase" && "${PKGPATH}" != "x11/qt5-odbc" && \
70 "${PKGPATH}" != "x11/qt5-mysql" && "${PKGPATH}" != "x11/qt5-psql" && \ 70 "${PKGPATH}" != "x11/qt5-mysql" && "${PKGPATH}" != "x11/qt5-psql" && \
71 "${PKGPATH}" != "x11/qt5-qtwayland" 71 "${PKGPATH}" != "x11/qt5-qtwayland"
72do-configure: 72do-configure:
73 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QTPREFIX}/bin/qmake -o Makefile 73 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QTPREFIX}/bin/qmake -o Makefile
74.endif 74.endif
75 75
76.if ${OPSYS} == "Darwin" 76.if ${OPSYS} == "Darwin"
77.PHONY: fix-darwin-install-name 77.PHONY: fix-darwin-install-name
78post-install: fix-darwin-install-name 78post-install: fix-darwin-install-name
79fix-darwin-install-name: 79fix-darwin-install-name:
80 ${FIND} ${DESTDIR}${PREFIX} -name "*.dylib" -print | \ 80 ${FIND} ${DESTDIR}${PREFIX} -name "*.dylib" -type f -print | \
81 while read lib; do \ 81 while read lib; do \
82 libname=`basename $${lib}`; \ 82 libname=`basename $${lib}`; \
83 libdir=`dirname $${lib} | sed -e 's,${DESTDIR},,'`; \ 83 libdir=`dirname $${lib} | sed -e 's,${DESTDIR},,'`; \
84 install_name_tool -id $${libdir}/$${libname} $${lib}; \ 84 install_name_tool -id $${libdir}/$${libname} $${lib}; \
85 done 85 done
86.endif 86.endif
cvs diff -r1.21 -r1.22 pkgsrc/x11/qt5-qtcharts/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtcharts/Makefile 2020/11/21 11:22:31 1.21
+++ pkgsrc/x11/qt5-qtcharts/Makefile 2020/11/29 22:33:21 1.22
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.21 2020/11/21 11:22:31 adam Exp $ 1# $NetBSD: Makefile,v 1.22 2020/11/29 22:33:21 dbj Exp $
2 2
3DISTNAME= qtcharts-everywhere-src-${QTVERSION} 3DISTNAME= qtcharts-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtcharts-${QTVERSION} 4PKGNAME= qt5-qtcharts-${QTVERSION}
 5PKGREVISION= 1
5COMMENT= Qt5 module for charts framework 6COMMENT= Qt5 module for charts framework
6 7
7BUILD_TARGET= sub-src 8BUILD_TARGET= sub-src
8INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 9INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
9INSTALLATION_DIRS+= lib/pkgconfig 10INSTALLATION_DIRS+= lib/pkgconfig
10 11
11.include "../../x11/qt5-qtbase/Makefile.common" 12.include "../../x11/qt5-qtbase/Makefile.common"
12 13
13post-install: 14post-install:
14.for i in Qt5Charts.pc 15.for i in Qt5Charts.pc
15 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ 16 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
16 ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} 17 ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
17.endfor 18.endfor
cvs diff -r1.17 -r1.18 pkgsrc/x11/qt5-qtconnectivity/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtconnectivity/Makefile 2020/11/21 11:22:32 1.17
+++ pkgsrc/x11/qt5-qtconnectivity/Makefile 2020/11/29 22:33:21 1.18
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.17 2020/11/21 11:22:32 adam Exp $ 1# $NetBSD: Makefile,v 1.18 2020/11/29 22:33:21 dbj Exp $
2 2
3DISTNAME= qtconnectivity-everywhere-src-${QTVERSION} 3DISTNAME= qtconnectivity-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtconnectivity-${QTVERSION} 4PKGNAME= qt5-qtconnectivity-${QTVERSION}
 5PKGREVISION= 1
5COMMENT= Qt5 module for connectivity framework 6COMMENT= Qt5 module for connectivity framework
6 7
7BUILD_TARGET= sub-src 8BUILD_TARGET= sub-src
8INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 9INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
9INSTALLATION_DIRS+= lib/pkgconfig 10INSTALLATION_DIRS+= lib/pkgconfig
10 11
11.include "../../x11/qt5-qtbase/Makefile.common" 12.include "../../x11/qt5-qtbase/Makefile.common"
12 13
13post-install: 14post-install:
14.for i in Qt5Bluetooth.pc Qt5Nfc.pc 15.for i in Qt5Bluetooth.pc Qt5Nfc.pc
15 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ 16 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
16 ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} 17 ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
17.endfor 18.endfor
cvs diff -r1.55 -r1.56 pkgsrc/x11/qt5-qtdeclarative/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtdeclarative/Makefile 2020/11/21 11:22:32 1.55
+++ pkgsrc/x11/qt5-qtdeclarative/Makefile 2020/11/29 22:33:22 1.56
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.55 2020/11/21 11:22:32 adam Exp $ 1# $NetBSD: Makefile,v 1.56 2020/11/29 22:33:22 dbj Exp $
2 2
3DISTNAME= qtdeclarative-everywhere-src-${QTVERSION} 3DISTNAME= qtdeclarative-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtdeclarative-${QTVERSION} 4PKGNAME= qt5-qtdeclarative-${QTVERSION}
 5PKGREVISION= 1
5COMMENT= Qt5 module for declarative framework 6COMMENT= Qt5 module for declarative framework
6 7
7BUILD_TARGET= sub-tools 8BUILD_TARGET= sub-tools
8INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 9INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
9INSTALLATION_DIRS+= lib/pkgconfig 10INSTALLATION_DIRS+= lib/pkgconfig
10 11
11.include "../../x11/qt5-qtbase/Makefile.common" 12.include "../../x11/qt5-qtbase/Makefile.common"
12 13
13post-install: 14post-install:
14.for i in Qt5Qml.pc Qt5Quick.pc Qt5QuickTest.pc Qt5QuickWidgets.pc 15.for i in Qt5Qml.pc Qt5Quick.pc Qt5QuickTest.pc Qt5QuickWidgets.pc
15 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ 16 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
16 ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} 17 ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
17.endfor 18.endfor
cvs diff -r1.63 -r1.64 pkgsrc/x11/qt5-qtdoc/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtdoc/Makefile 2020/11/21 11:22:32 1.63
+++ pkgsrc/x11/qt5-qtdoc/Makefile 2020/11/29 22:33:22 1.64
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.63 2020/11/21 11:22:32 adam Exp $ 1# $NetBSD: Makefile,v 1.64 2020/11/29 22:33:22 dbj Exp $
2 2
3DISTNAME= qtdoc-everywhere-src-${QTVERSION} 3DISTNAME= qtdoc-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtdoc-${QTVERSION} 4PKGNAME= qt5-qtdoc-${QTVERSION}
 5PKGREVISION= 1
5COMMENT= Qt5 documentations 6COMMENT= Qt5 documentations
6 7
7MAKE_ENV+= QTDIR=${QTDIR} 8MAKE_ENV+= QTDIR=${QTDIR}
8 9
9BUILD_TARGET= docs 10BUILD_TARGET= docs
10INSTALL_TARGET= install_docs 11INSTALL_TARGET= install_docs
11 12
12INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 13INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
13 14
14.include "../../x11/qt5-qtbase/Makefile.common" 15.include "../../x11/qt5-qtbase/Makefile.common"
15 16
16.include "../../x11/qt5-qttools/buildlink3.mk" 17.include "../../x11/qt5-qttools/buildlink3.mk"
17.include "../../mk/bsd.pkg.mk" 18.include "../../mk/bsd.pkg.mk"
cvs diff -r1.47 -r1.48 pkgsrc/x11/qt5-qtgraphicaleffects/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtgraphicaleffects/Makefile 2020/11/21 11:22:32 1.47
+++ pkgsrc/x11/qt5-qtgraphicaleffects/Makefile 2020/11/29 22:33:22 1.48
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1# $NetBSD: Makefile,v 1.47 2020/11/21 11:22:32 adam Exp $ 1# $NetBSD: Makefile,v 1.48 2020/11/29 22:33:22 dbj Exp $
2 2
3DISTNAME= qtgraphicaleffects-everywhere-src-${QTVERSION} 3DISTNAME= qtgraphicaleffects-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtgraphicaleffects-${QTVERSION} 4PKGNAME= qt5-qtgraphicaleffects-${QTVERSION}
 5PKGREVISION= 1
5COMMENT= Qt5 module for Graphics effects 6COMMENT= Qt5 module for Graphics effects
6 7
7BUILD_TARGET= sub-src 8BUILD_TARGET= sub-src
8MAKE_ENV+= QTDIR=${QTDIR} 9MAKE_ENV+= QTDIR=${QTDIR}
9 10
10INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 11INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
11 12
12.include "../../x11/qt5-qtbase/Makefile.common" 13.include "../../x11/qt5-qtbase/Makefile.common"
13 14
14.include "../../x11/qt5-qtdeclarative/buildlink3.mk" 15.include "../../x11/qt5-qtdeclarative/buildlink3.mk"
15.include "../../mk/bsd.pkg.mk" 16.include "../../mk/bsd.pkg.mk"
cvs diff -r1.51 -r1.52 pkgsrc/x11/qt5-qtimageformats/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtimageformats/Makefile 2020/11/21 11:22:32 1.51
+++ pkgsrc/x11/qt5-qtimageformats/Makefile 2020/11/29 22:33:22 1.52
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.51 2020/11/21 11:22:32 adam Exp $ 1# $NetBSD: Makefile,v 1.52 2020/11/29 22:33:22 dbj Exp $
2 2
3DISTNAME= qtimageformats-everywhere-src-${QTVERSION} 3DISTNAME= qtimageformats-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtimageformats-${QTVERSION} 4PKGNAME= qt5-qtimageformats-${QTVERSION}
 5PKGREVISION= 1
5COMMENT= Qt5 module for Image formats 6COMMENT= Qt5 module for Image formats
6 7
7BUILD_TARGET= sub-src 8BUILD_TARGET= sub-src
8MAKE_ENV+= QTDIR=${QTDIR} 9MAKE_ENV+= QTDIR=${QTDIR}
9 10
10INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 11INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
11 12
12.include "../../x11/qt5-qtbase/Makefile.common" 13.include "../../x11/qt5-qtbase/Makefile.common"
13 14
14.include "../../archivers/xz/buildlink3.mk" 15.include "../../archivers/xz/buildlink3.mk"
15.include "../../graphics/jasper/buildlink3.mk" 16.include "../../graphics/jasper/buildlink3.mk"
16.include "../../graphics/libwebp/buildlink3.mk" 17.include "../../graphics/libwebp/buildlink3.mk"
17.include "../../graphics/mng/buildlink3.mk" 18.include "../../graphics/mng/buildlink3.mk"
cvs diff -r1.51 -r1.52 pkgsrc/x11/qt5-qtlocation/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtlocation/Makefile 2020/11/21 11:22:32 1.51
+++ pkgsrc/x11/qt5-qtlocation/Makefile 2020/11/29 22:33:22 1.52
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.51 2020/11/21 11:22:32 adam Exp $ 1# $NetBSD: Makefile,v 1.52 2020/11/29 22:33:22 dbj Exp $
2 2
3DISTNAME= qtlocation-everywhere-src-${QTVERSION} 3DISTNAME= qtlocation-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtlocation-${QTVERSION} 4PKGNAME= qt5-qtlocation-${QTVERSION}
 5PKGREVISION= 1
5COMMENT= Qt5 module for qtlocation 6COMMENT= Qt5 module for qtlocation
6 7
7BUILD_TARGET= sub-src 8BUILD_TARGET= sub-src
8MAKE_ENV+= QTDIR=${QTDIR} 9MAKE_ENV+= QTDIR=${QTDIR}
9INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 10INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
10INSTALLATION_DIRS+= lib/pkgconfig 11INSTALLATION_DIRS+= lib/pkgconfig
11 12
12.include "../../x11/qt5-qtbase/Makefile.common" 13.include "../../x11/qt5-qtbase/Makefile.common"
13 14
14post-install: 15post-install:
15.for i in Qt5Location.pc Qt5Positioning.pc 16.for i in Qt5Location.pc Qt5Positioning.pc
16 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ 17 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
17 ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} 18 ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
cvs diff -r1.42 -r1.43 pkgsrc/x11/qt5-qtmacextras/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtmacextras/Makefile 2020/11/21 11:22:32 1.42
+++ pkgsrc/x11/qt5-qtmacextras/Makefile 2020/11/29 22:33:22 1.43
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.42 2020/11/21 11:22:32 adam Exp $ 1# $NetBSD: Makefile,v 1.43 2020/11/29 22:33:22 dbj Exp $
2 2
3DISTNAME= qtmacextras-everywhere-src-${QTVERSION} 3DISTNAME= qtmacextras-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtmacextras-${QTVERSION} 4PKGNAME= qt5-qtmacextras-${QTVERSION}
 5PKGREVISION= 1
5COMMENT= Qt5 module for Mac extras 6COMMENT= Qt5 module for Mac extras
6 7
7BUILD_TARGET= sub-src 8BUILD_TARGET= sub-src
8INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 9INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
9INSTALLATION_DIRS+= lib/pkgconfig 10INSTALLATION_DIRS+= lib/pkgconfig
10 11
11ONLY_FOR_PLATFORM= Darwin-*-* 12ONLY_FOR_PLATFORM= Darwin-*-*
12 13
13.include "../../x11/qt5-qtbase/Makefile.common" 14.include "../../x11/qt5-qtbase/Makefile.common"
14 15
15post-install: 16post-install:
16.for i in Qt5MacExtras.pc 17.for i in Qt5MacExtras.pc
17 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ 18 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
cvs diff -r1.72 -r1.73 pkgsrc/x11/qt5-qtmultimedia/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtmultimedia/Makefile 2020/11/21 11:22:33 1.72
+++ pkgsrc/x11/qt5-qtmultimedia/Makefile 2020/11/29 22:33:22 1.73
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.72 2020/11/21 11:22:33 adam Exp $ 1# $NetBSD: Makefile,v 1.73 2020/11/29 22:33:22 dbj Exp $
2 2
3DISTNAME= qtmultimedia-everywhere-src-${QTVERSION} 3DISTNAME= qtmultimedia-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtmultimedia-${QTVERSION} 4PKGNAME= qt5-qtmultimedia-${QTVERSION}
 5PKGREVISION= 1
5COMMENT= Qt5 module for multimedia 6COMMENT= Qt5 module for multimedia
6 7
7BUILD_TARGET= sub-src 8BUILD_TARGET= sub-src
8MAKE_ENV+= QTDIR=${QTDIR} 9MAKE_ENV+= QTDIR=${QTDIR}
9INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 10INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
10INSTALLATION_DIRS+= lib/pkgconfig 11INSTALLATION_DIRS+= lib/pkgconfig
11 12
12.include "../../x11/qt5-qtbase/Makefile.common" 13.include "../../x11/qt5-qtbase/Makefile.common"
13 14
14# Needs gnu+11 for alloca. 15# Needs gnu+11 for alloca.
15BUILDLINK_TRANSFORM+= rm:-std=c++1z 16BUILDLINK_TRANSFORM+= rm:-std=c++1z
16 17
17post-install: 18post-install:
cvs diff -r1.21 -r1.22 pkgsrc/x11/qt5-qtnetworkauth/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtnetworkauth/Makefile 2020/11/21 11:22:33 1.21
+++ pkgsrc/x11/qt5-qtnetworkauth/Makefile 2020/11/29 22:33:22 1.22
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.21 2020/11/21 11:22:33 adam Exp $ 1# $NetBSD: Makefile,v 1.22 2020/11/29 22:33:22 dbj Exp $
2 2
3DISTNAME= qtnetworkauth-everywhere-src-${QTVERSION} 3DISTNAME= qtnetworkauth-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtnetworkauth-${QTVERSION} 4PKGNAME= qt5-qtnetworkauth-${QTVERSION}
 5PKGREVISION= 1
5COMMENT= Qt5 module for networkauth framework 6COMMENT= Qt5 module for networkauth framework
6 7
7BUILD_TARGET= sub-src 8BUILD_TARGET= sub-src
8INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 9INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
9INSTALLATION_DIRS+= lib/pkgconfig 10INSTALLATION_DIRS+= lib/pkgconfig
10 11
11.include "../../x11/qt5-qtbase/Makefile.common" 12.include "../../x11/qt5-qtbase/Makefile.common"
12 13
13post-install: 14post-install:
14.for i in Qt5NetworkAuth.pc 15.for i in Qt5NetworkAuth.pc
15 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ 16 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
16 ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} 17 ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
17.endfor 18.endfor
cvs diff -r1.47 -r1.48 pkgsrc/x11/qt5-qtquickcontrols/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtquickcontrols/Makefile 2020/11/21 11:22:33 1.47
+++ pkgsrc/x11/qt5-qtquickcontrols/Makefile 2020/11/29 22:33:22 1.48
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1# $NetBSD: Makefile,v 1.47 2020/11/21 11:22:33 adam Exp $ 1# $NetBSD: Makefile,v 1.48 2020/11/29 22:33:22 dbj Exp $
2 2
3DISTNAME= qtquickcontrols-everywhere-src-${QTVERSION} 3DISTNAME= qtquickcontrols-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtquickcontrols-${QTVERSION} 4PKGNAME= qt5-qtquickcontrols-${QTVERSION}
 5PKGREVISION= 1
5COMMENT= Qt5 module for QuickControls 6COMMENT= Qt5 module for QuickControls
6 7
7BUILD_TARGET= sub-src 8BUILD_TARGET= sub-src
8MAKE_ENV+= QTDIR=${QTDIR} 9MAKE_ENV+= QTDIR=${QTDIR}
9 10
10INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 11INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
11 12
12.include "../../x11/qt5-qtbase/Makefile.common" 13.include "../../x11/qt5-qtbase/Makefile.common"
13 14
14.include "../../x11/qt5-qtdeclarative/buildlink3.mk" 15.include "../../x11/qt5-qtdeclarative/buildlink3.mk"
15.include "../../mk/bsd.pkg.mk" 16.include "../../mk/bsd.pkg.mk"
cvs diff -r1.29 -r1.30 pkgsrc/x11/qt5-qtquickcontrols2/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtquickcontrols2/Makefile 2020/11/21 11:22:33 1.29
+++ pkgsrc/x11/qt5-qtquickcontrols2/Makefile 2020/11/29 22:33:23 1.30
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.29 2020/11/21 11:22:33 adam Exp $ 1# $NetBSD: Makefile,v 1.30 2020/11/29 22:33:23 dbj Exp $
2 2
3DISTNAME= qtquickcontrols2-everywhere-src-${QTVERSION} 3DISTNAME= qtquickcontrols2-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtquickcontrols2-${QTVERSION} 4PKGNAME= qt5-qtquickcontrols2-${QTVERSION}
 5PKGREVISION= 1
5COMMENT= Next generation user interface controls based on Qt Quick 6COMMENT= Next generation user interface controls based on Qt Quick
6 7
7BUILD_TARGET= sub-src 8BUILD_TARGET= sub-src
8MAKE_ENV+= QTDIR=${QTDIR} 9MAKE_ENV+= QTDIR=${QTDIR}
9 10
10INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 11INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
11INSTALLATION_DIRS+= lib/pkgconfig 12INSTALLATION_DIRS+= lib/pkgconfig
12 13
13.include "../../x11/qt5-qtbase/Makefile.common" 14.include "../../x11/qt5-qtbase/Makefile.common"
14 15
15post-install: 16post-install:
16.for i in Qt5QuickControls2.pc 17.for i in Qt5QuickControls2.pc
17 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ 18 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
cvs diff -r1.64 -r1.65 pkgsrc/x11/qt5-qtscript/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtscript/Makefile 2020/11/21 11:22:33 1.64
+++ pkgsrc/x11/qt5-qtscript/Makefile 2020/11/29 22:33:23 1.65
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.64 2020/11/21 11:22:33 adam Exp $ 1# $NetBSD: Makefile,v 1.65 2020/11/29 22:33:23 dbj Exp $
2 2
3DISTNAME= qtscript-everywhere-src-${QTVERSION} 3DISTNAME= qtscript-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtscript-${QTVERSION} 4PKGNAME= qt5-qtscript-${QTVERSION}
 5PKGREVISION= 1
5COMMENT= Qt5 module for script 6COMMENT= Qt5 module for script
6 7
7BUILD_TARGET= sub-src 8BUILD_TARGET= sub-src
8MAKE_ENV+= QTDIR=${QTDIR} 9MAKE_ENV+= QTDIR=${QTDIR}
9 10
10INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 11INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
11INSTALLATION_DIRS+= lib/pkgconfig 12INSTALLATION_DIRS+= lib/pkgconfig
12 13
13.include "../../x11/qt5-qtbase/Makefile.common" 14.include "../../x11/qt5-qtbase/Makefile.common"
14 15
15post-install: 16post-install:
16.for i in Qt5Script.pc Qt5ScriptTools.pc 17.for i in Qt5Script.pc Qt5ScriptTools.pc
17 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ 18 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
cvs diff -r1.13 -r1.14 pkgsrc/x11/qt5-qtscxml/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtscxml/Makefile 2020/11/21 11:22:33 1.13
+++ pkgsrc/x11/qt5-qtscxml/Makefile 2020/11/29 22:33:23 1.14
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.13 2020/11/21 11:22:33 adam Exp $ 1# $NetBSD: Makefile,v 1.14 2020/11/29 22:33:23 dbj Exp $
2 2
3DISTNAME= qtscxml-everywhere-src-${QTVERSION} 3DISTNAME= qtscxml-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtscxml-${QTVERSION} 4PKGNAME= qt5-qtscxml-${QTVERSION}
 5PKGREVISION= 1
5COMMENT= Qt5 module for scxml framework 6COMMENT= Qt5 module for scxml framework
6 7
7BUILD_TARGET= sub-src 8BUILD_TARGET= sub-src
8INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 9INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
9INSTALLATION_DIRS+= lib/pkgconfig 10INSTALLATION_DIRS+= lib/pkgconfig
10 11
11.include "../../x11/qt5-qtbase/Makefile.common" 12.include "../../x11/qt5-qtbase/Makefile.common"
12 13
13post-install: 14post-install:
14.for i in Qt5Scxml.pc 15.for i in Qt5Scxml.pc
15 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ 16 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
16 ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} 17 ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
17.endfor 18.endfor
cvs diff -r1.50 -r1.51 pkgsrc/x11/qt5-qtsensors/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtsensors/Makefile 2020/11/21 11:22:33 1.50
+++ pkgsrc/x11/qt5-qtsensors/Makefile 2020/11/29 22:33:23 1.51
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.50 2020/11/21 11:22:33 adam Exp $ 1# $NetBSD: Makefile,v 1.51 2020/11/29 22:33:23 dbj Exp $
2 2
3DISTNAME= qtsensors-everywhere-src-${QTVERSION} 3DISTNAME= qtsensors-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtsensors-${QTVERSION} 4PKGNAME= qt5-qtsensors-${QTVERSION}
 5PKGREVISION= 1
5COMMENT= Qt5 module for Sensors 6COMMENT= Qt5 module for Sensors
6 7
7BUILD_TARGET= sub-src 8BUILD_TARGET= sub-src
8MAKE_ENV+= QTDIR=${QTDIR} 9MAKE_ENV+= QTDIR=${QTDIR}
9 10
10INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 11INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
11INSTALLATION_DIRS+= lib/pkgconfig 12INSTALLATION_DIRS+= lib/pkgconfig
12 13
13.include "../../x11/qt5-qtbase/Makefile.common" 14.include "../../x11/qt5-qtbase/Makefile.common"
14 15
15post-install: 16post-install:
16.for i in Qt5Sensors.pc 17.for i in Qt5Sensors.pc
17 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ 18 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
cvs diff -r1.48 -r1.49 pkgsrc/x11/qt5-qtserialport/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtserialport/Makefile 2020/11/21 11:22:34 1.48
+++ pkgsrc/x11/qt5-qtserialport/Makefile 2020/11/29 22:33:23 1.49
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.48 2020/11/21 11:22:34 adam Exp $ 1# $NetBSD: Makefile,v 1.49 2020/11/29 22:33:23 dbj Exp $
2 2
3DISTNAME= qtserialport-everywhere-src-${QTVERSION} 3DISTNAME= qtserialport-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtserialport-${QTVERSION} 4PKGNAME= qt5-qtserialport-${QTVERSION}
 5PKGREVISION= 1
5COMMENT= Qt5 module for Serial Port 6COMMENT= Qt5 module for Serial Port
6 7
7BUILD_TARGET= sub-src 8BUILD_TARGET= sub-src
8MAKE_ENV+= QTDIR=${QTDIR} 9MAKE_ENV+= QTDIR=${QTDIR}
9 10
10INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 11INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
11INSTALLATION_DIRS+= lib/pkgconfig 12INSTALLATION_DIRS+= lib/pkgconfig
12 13
13.include "../../x11/qt5-qtbase/Makefile.common" 14.include "../../x11/qt5-qtbase/Makefile.common"
14 15
15post-install: 16post-install:
16.for i in Qt5SerialPort.pc 17.for i in Qt5SerialPort.pc
17 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ 18 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
cvs diff -r1.16 -r1.17 pkgsrc/x11/qt5-qtspeech/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtspeech/Makefile 2020/11/21 11:22:34 1.16
+++ pkgsrc/x11/qt5-qtspeech/Makefile 2020/11/29 22:33:23 1.17
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.16 2020/11/21 11:22:34 adam Exp $ 1# $NetBSD: Makefile,v 1.17 2020/11/29 22:33:23 dbj Exp $
2 2
3DISTNAME= qtspeech-everywhere-src-${QTVERSION} 3DISTNAME= qtspeech-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtspeech-${QTVERSION} 4PKGNAME= qt5-qtspeech-${QTVERSION}
 5PKGREVISION= 1
5COMMENT= Qt5 module to make text to speech and speech recognition easy 6COMMENT= Qt5 module to make text to speech and speech recognition easy
6 7
7MAKE_ENV+= QTDIR=${QTDIR} 8MAKE_ENV+= QTDIR=${QTDIR}
8INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 9INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
9INSTALLATION_DIRS+= lib/pkgconfig 10INSTALLATION_DIRS+= lib/pkgconfig
10 11
11.include "../../x11/qt5-qtbase/Makefile.common" 12.include "../../x11/qt5-qtbase/Makefile.common"
12 13
13post-install: 14post-install:
14.for i in Qt5TextToSpeech.pc 15.for i in Qt5TextToSpeech.pc
15 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ 16 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
16 ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} 17 ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
17.endfor 18.endfor
cvs diff -r1.48 -r1.49 pkgsrc/x11/qt5-qtsvg/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtsvg/Makefile 2020/11/21 11:22:34 1.48
+++ pkgsrc/x11/qt5-qtsvg/Makefile 2020/11/29 22:33:23 1.49
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.48 2020/11/21 11:22:34 adam Exp $ 1# $NetBSD: Makefile,v 1.49 2020/11/29 22:33:23 dbj Exp $
2 2
3DISTNAME= qtsvg-everywhere-src-${QTVERSION} 3DISTNAME= qtsvg-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtsvg-${QTVERSION} 4PKGNAME= qt5-qtsvg-${QTVERSION}
 5PKGREVISION= 1
5COMMENT= Qt5 module for SVG 6COMMENT= Qt5 module for SVG
6 7
7BUILD_TARGET= sub-src 8BUILD_TARGET= sub-src
8MAKE_ENV+= QTDIR=${QTDIR} 9MAKE_ENV+= QTDIR=${QTDIR}
9 10
10INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 11INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
11INSTALLATION_DIRS+= lib/pkgconfig 12INSTALLATION_DIRS+= lib/pkgconfig
12 13
13.include "../../x11/qt5-qtbase/Makefile.common" 14.include "../../x11/qt5-qtbase/Makefile.common"
14 15
15post-install: 16post-install:
16.for i in Qt5Svg.pc 17.for i in Qt5Svg.pc
17 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ 18 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
cvs diff -r1.71 -r1.72 pkgsrc/x11/qt5-qttools/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qttools/Makefile 2020/11/21 11:22:34 1.71
+++ pkgsrc/x11/qt5-qttools/Makefile 2020/11/29 22:33:23 1.72
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.71 2020/11/21 11:22:34 adam Exp $ 1# $NetBSD: Makefile,v 1.72 2020/11/29 22:33:23 dbj Exp $
2 2
3DISTNAME= qttools-everywhere-src-${QTVERSION} 3DISTNAME= qttools-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qttools-${QTVERSION} 4PKGNAME= qt5-qttools-${QTVERSION}
 5PKGREVISION= 1
5COMMENT= Qt5 tools 6COMMENT= Qt5 tools
6 7
7DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils 8DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils
8 9
9MAKE_ENV+= QTDIR=${QTDIR} 10MAKE_ENV+= QTDIR=${QTDIR}
10INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 11INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
11INSTALLATION_DIRS+= lib/pkgconfig 12INSTALLATION_DIRS+= lib/pkgconfig
12 13
13PKG_OPTIONS_VAR= PKG_OPTIONS.qt5-qttools 14PKG_OPTIONS_VAR= PKG_OPTIONS.qt5-qttools
14PKG_SUPPORTED_OPTIONS+= llvm 15PKG_SUPPORTED_OPTIONS+= llvm
15PKG_SUGGESTED_OPTIONS+= llvm 16PKG_SUGGESTED_OPTIONS+= llvm
16PLIST_VARS+= llvm 17PLIST_VARS+= llvm
17 18
cvs diff -r1.63 -r1.64 pkgsrc/x11/qt5-qttranslations/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qttranslations/Makefile 2020/11/21 11:22:34 1.63
+++ pkgsrc/x11/qt5-qttranslations/Makefile 2020/11/29 22:33:23 1.64
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1# $NetBSD: Makefile,v 1.63 2020/11/21 11:22:34 adam Exp $ 1# $NetBSD: Makefile,v 1.64 2020/11/29 22:33:23 dbj Exp $
2 2
3DISTNAME= qttranslations-everywhere-src-${QTVERSION} 3DISTNAME= qttranslations-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qttranslations-${QTVERSION} 4PKGNAME= qt5-qttranslations-${QTVERSION}
 5PKGREVISION= 1
5COMMENT= Qt5 translations 6COMMENT= Qt5 translations
6 7
7MAKE_ENV+= QTDIR=${QTDIR} 8MAKE_ENV+= QTDIR=${QTDIR}
8INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 9INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
9 10
10.include "../../x11/qt5-qtbase/Makefile.common" 11.include "../../x11/qt5-qtbase/Makefile.common"
11 12
12.include "../../x11/qt5-qttools/buildlink3.mk" 13.include "../../x11/qt5-qttools/buildlink3.mk"
13.include "../../mk/bsd.pkg.mk" 14.include "../../mk/bsd.pkg.mk"
cvs diff -r1.13 -r1.14 pkgsrc/x11/qt5-qtvirtualkeyboard/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtvirtualkeyboard/Makefile 2020/11/21 11:22:34 1.13
+++ pkgsrc/x11/qt5-qtvirtualkeyboard/Makefile 2020/11/29 22:33:24 1.14
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.13 2020/11/21 11:22:34 adam Exp $ 1# $NetBSD: Makefile,v 1.14 2020/11/29 22:33:24 dbj Exp $
2 2
3DISTNAME= qtvirtualkeyboard-everywhere-src-${QTVERSION} 3DISTNAME= qtvirtualkeyboard-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtvirtualkeyboard-${QTVERSION} 4PKGNAME= qt5-qtvirtualkeyboard-${QTVERSION}
 5PKGREVISION= 2
5COMMENT= Qt5 module for virtualkeyboard framework 6COMMENT= Qt5 module for virtualkeyboard framework
6 7
7BUILD_TARGET= sub-src 8BUILD_TARGET= sub-src
8INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 9INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
9INSTALLATION_DIRS+= lib/pkgconfig 10INSTALLATION_DIRS+= lib/pkgconfig
10 11
11.include "../../x11/qt5-qtbase/Makefile.common" 12.include "../../x11/qt5-qtbase/Makefile.common"
12 13
13post-install: 14post-install:
14.for i in Qt5VirtualKeyboard.pc 15.for i in Qt5VirtualKeyboard.pc
15 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ 16 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
16 ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} 17 ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
17.endfor 18.endfor
cvs diff -r1.16 -r1.17 pkgsrc/x11/qt5-qtwayland/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtwayland/Makefile 2020/11/21 11:22:34 1.16
+++ pkgsrc/x11/qt5-qtwayland/Makefile 2020/11/29 22:33:24 1.17
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.16 2020/11/21 11:22:34 adam Exp $ 1# $NetBSD: Makefile,v 1.17 2020/11/29 22:33:24 dbj Exp $
2 2
3DISTNAME= qtwayland-everywhere-src-${QTVERSION} 3DISTNAME= qtwayland-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtwayland-${QTVERSION} 4PKGNAME= qt5-qtwayland-${QTVERSION}
 5PKGREVISION= 1
5COMMENT= Qt5 module for Wayland support 6COMMENT= Qt5 module for Wayland support
6 7
7.include "../../devel/wayland/platform.mk" 8.include "../../devel/wayland/platform.mk"
8 9
9.if empty(PLATFORM_SUPPORTS_WAYLAND:M[Yy][Ee][Ss]) 10.if empty(PLATFORM_SUPPORTS_WAYLAND:M[Yy][Ee][Ss])
10PKG_SKIP_REASON+= "Platform does not support Wayland" 11PKG_SKIP_REASON+= "Platform does not support Wayland"
11.endif 12.endif
12 13
13BUILD_TARGET= sub-src 14BUILD_TARGET= sub-src
14INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 15INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
15INSTALLATION_DIRS+= lib/pkgconfig 16INSTALLATION_DIRS+= lib/pkgconfig
16 17
17SUBST_CLASSES+= conf 18SUBST_CLASSES+= conf
cvs diff -r1.44 -r1.45 pkgsrc/x11/qt5-qtwebchannel/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtwebchannel/Makefile 2020/11/21 11:22:34 1.44
+++ pkgsrc/x11/qt5-qtwebchannel/Makefile 2020/11/29 22:33:24 1.45
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.44 2020/11/21 11:22:34 adam Exp $ 1# $NetBSD: Makefile,v 1.45 2020/11/29 22:33:24 dbj Exp $
2 2
3DISTNAME= qtwebchannel-everywhere-src-${QTVERSION} 3DISTNAME= qtwebchannel-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtwebchannel-${QTVERSION} 4PKGNAME= qt5-qtwebchannel-${QTVERSION}
 5PKGREVISION= 1
5COMMENT= Qt5 WebChannel module 6COMMENT= Qt5 WebChannel module
6 7
7MAKE_ENV+= QTDIR=${QTDIR} 8MAKE_ENV+= QTDIR=${QTDIR}
8INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 9INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
9INSTALLATION_DIRS+= lib/pkgconfig 10INSTALLATION_DIRS+= lib/pkgconfig
10 11
11.include "../../x11/qt5-qtbase/Makefile.common" 12.include "../../x11/qt5-qtbase/Makefile.common"
12 13
13post-install: 14post-install:
14.for i in Qt5WebChannel.pc 15.for i in Qt5WebChannel.pc
15 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ 16 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
16 ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} 17 ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
17.endfor 18.endfor
cvs diff -r1.42 -r1.43 pkgsrc/x11/qt5-qtwebsockets/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtwebsockets/Makefile 2020/11/21 11:22:35 1.42
+++ pkgsrc/x11/qt5-qtwebsockets/Makefile 2020/11/29 22:33:24 1.43
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.42 2020/11/21 11:22:35 adam Exp $ 1# $NetBSD: Makefile,v 1.43 2020/11/29 22:33:24 dbj Exp $
2 2
3DISTNAME= qtwebsockets-everywhere-src-${QTVERSION} 3DISTNAME= qtwebsockets-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtwebsockets-${QTVERSION} 4PKGNAME= qt5-qtwebsockets-${QTVERSION}
 5PKGREVISION= 1
5COMMENT= Qt5 module for websockets 6COMMENT= Qt5 module for websockets
6 7
7MAKE_ENV+= QTDIR=${QTDIR} 8MAKE_ENV+= QTDIR=${QTDIR}
8INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 9INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
9INSTALLATION_DIRS+= lib/pkgconfig 10INSTALLATION_DIRS+= lib/pkgconfig
10 11
11.include "../../x11/qt5-qtbase/Makefile.common" 12.include "../../x11/qt5-qtbase/Makefile.common"
12 13
13post-install: 14post-install:
14.for i in Qt5WebSockets.pc 15.for i in Qt5WebSockets.pc
15 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ 16 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
16 ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} 17 ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
17.endfor 18.endfor
cvs diff -r1.48 -r1.49 pkgsrc/x11/qt5-qtx11extras/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtx11extras/Makefile 2020/11/21 11:22:35 1.48
+++ pkgsrc/x11/qt5-qtx11extras/Makefile 2020/11/29 22:33:24 1.49
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.48 2020/11/21 11:22:35 adam Exp $ 1# $NetBSD: Makefile,v 1.49 2020/11/29 22:33:24 dbj Exp $
2 2
3DISTNAME= qtx11extras-everywhere-src-${QTVERSION} 3DISTNAME= qtx11extras-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtx11extras-${QTVERSION} 4PKGNAME= qt5-qtx11extras-${QTVERSION}
 5PKGREVISION= 1
5COMMENT= Qt5 module for X11 extras 6COMMENT= Qt5 module for X11 extras
6 7
7BUILD_TARGET= sub-src 8BUILD_TARGET= sub-src
8INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 9INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
9INSTALLATION_DIRS+= lib/pkgconfig 10INSTALLATION_DIRS+= lib/pkgconfig
10 11
11.include "../../x11/qt5-qtbase/Makefile.common" 12.include "../../x11/qt5-qtbase/Makefile.common"
12 13
13post-install: 14post-install:
14.for i in Qt5X11Extras.pc 15.for i in Qt5X11Extras.pc
15 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ 16 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
16 ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} 17 ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
17.endfor 18.endfor
cvs diff -r1.48 -r1.49 pkgsrc/x11/qt5-qtxmlpatterns/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtxmlpatterns/Makefile 2020/11/21 11:22:35 1.48
+++ pkgsrc/x11/qt5-qtxmlpatterns/Makefile 2020/11/29 22:33:24 1.49
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.48 2020/11/21 11:22:35 adam Exp $ 1# $NetBSD: Makefile,v 1.49 2020/11/29 22:33:24 dbj Exp $
2 2
3DISTNAME= qtxmlpatterns-everywhere-src-${QTVERSION} 3DISTNAME= qtxmlpatterns-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtxmlpatterns-${QTVERSION} 4PKGNAME= qt5-qtxmlpatterns-${QTVERSION}
 5PKGREVISION= 1
5COMMENT= Qt5 module for XML Patterns 6COMMENT= Qt5 module for XML Patterns
6 7
7BUILD_TARGET= sub-tools 8BUILD_TARGET= sub-tools
8 9
9INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 10INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
10INSTALLATION_DIRS+= lib/pkgconfig 11INSTALLATION_DIRS+= lib/pkgconfig
11 12
12.include "../../x11/qt5-qtbase/Makefile.common" 13.include "../../x11/qt5-qtbase/Makefile.common"
13 14
14post-install: 15post-install:
15.for i in Qt5XmlPatterns.pc 16.for i in Qt5XmlPatterns.pc
16 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ 17 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
17 ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} 18 ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}