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
--- 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,7 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2020/11/21 11:22:31 adam Exp $
+# $NetBSD: Makefile,v 1.49 2020/11/29 22:33:21 dbj Exp $
DISTNAME= qtbase-everywhere-src-${QTVERSION}
PKGNAME= qt5-mysql-${QTVERSION}
+PKGREVISION= 1
COMMENT= Qt5 MySQL plugin
CFLAGS+= -I${BUILDLINK_PREFIX.mysql-client}/include/mysql
--- 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,7 +1,8 @@
-# $NetBSD: Makefile,v 1.49 2020/11/21 11:22:31 adam Exp $
+# $NetBSD: Makefile,v 1.50 2020/11/29 22:33:21 dbj Exp $
DISTNAME= qtbase-everywhere-src-${QTVERSION}
PKGNAME= qt5-odbc-${QTVERSION}
+PKGREVISION= 1
COMMENT= Qt5 odbc plugin
BUILD_DIRS= src/plugins/sqldrivers
--- 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,7 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2020/11/21 11:22:31 adam Exp $
+# $NetBSD: Makefile,v 1.52 2020/11/29 22:33:21 dbj Exp $
DISTNAME= qtbase-everywhere-src-${QTVERSION}
PKGNAME= qt5-psql-${QTVERSION}
+PKGREVISION= 1
COMMENT= Qt5 PostgreSQL plugin
BUILD_QT5= yes
--- 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,7 +1,8 @@
-# $NetBSD: Makefile,v 1.104 2020/11/21 11:22:31 adam Exp $
+# $NetBSD: Makefile,v 1.105 2020/11/29 22:33:21 dbj Exp $
DISTNAME= qtbase-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtbase-${QTVERSION}
+PKGREVISION= 1
COMMENT= C++ X GUI toolkit
.include "../../x11/qt5-qtbase/Makefile.common"
--- 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,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.45 2020/11/29 22:32:17 dbj Exp $
+# $NetBSD: Makefile.common,v 1.46 2020/11/29 22:33:21 dbj Exp $
# used by x11/qt5-mysql/Makefile
# used by x11/qt5-odbc/Makefile
# used by x11/qt5-psql/Makefile
@@ -77,7 +77,7 @@
.PHONY: fix-darwin-install-name
post-install: fix-darwin-install-name
fix-darwin-install-name:
- ${FIND} ${DESTDIR}${PREFIX} -name "*.dylib" -print | \
+ ${FIND} ${DESTDIR}${PREFIX} -name "*.dylib" -type f -print | \
while read lib; do \
libname=`basename $${lib}`; \
libdir=`dirname $${lib} | sed -e 's,${DESTDIR},,'`; \
--- 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,7 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2020/11/21 11:22:31 adam Exp $
+# $NetBSD: Makefile,v 1.22 2020/11/29 22:33:21 dbj Exp $
DISTNAME= qtcharts-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtcharts-${QTVERSION}
+PKGREVISION= 1
COMMENT= Qt5 module for charts framework
BUILD_TARGET= sub-src
--- 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,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2020/11/21 11:22:32 adam Exp $
+# $NetBSD: Makefile,v 1.18 2020/11/29 22:33:21 dbj Exp $
DISTNAME= qtconnectivity-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtconnectivity-${QTVERSION}
+PKGREVISION= 1
COMMENT= Qt5 module for connectivity framework
BUILD_TARGET= sub-src
--- 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,7 +1,8 @@
-# $NetBSD: Makefile,v 1.55 2020/11/21 11:22:32 adam Exp $
+# $NetBSD: Makefile,v 1.56 2020/11/29 22:33:22 dbj Exp $
DISTNAME= qtdeclarative-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtdeclarative-${QTVERSION}
+PKGREVISION= 1
COMMENT= Qt5 module for declarative framework
BUILD_TARGET= sub-tools
--- 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,7 +1,8 @@
-# $NetBSD: Makefile,v 1.63 2020/11/21 11:22:32 adam Exp $
+# $NetBSD: Makefile,v 1.64 2020/11/29 22:33:22 dbj Exp $
DISTNAME= qtdoc-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtdoc-${QTVERSION}
+PKGREVISION= 1
COMMENT= Qt5 documentations
MAKE_ENV+= QTDIR=${QTDIR}
--- 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,7 +1,8 @@
-# $NetBSD: Makefile,v 1.47 2020/11/21 11:22:32 adam Exp $
+# $NetBSD: Makefile,v 1.48 2020/11/29 22:33:22 dbj Exp $
DISTNAME= qtgraphicaleffects-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtgraphicaleffects-${QTVERSION}
+PKGREVISION= 1
COMMENT= Qt5 module for Graphics effects
BUILD_TARGET= sub-src
--- 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
--- 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,7 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2020/11/21 11:22:32 adam Exp $
+# $NetBSD: Makefile,v 1.52 2020/11/29 22:33:22 dbj Exp $
DISTNAME= qtlocation-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtlocation-${QTVERSION}
+PKGREVISION= 1
COMMENT= Qt5 module for qtlocation
BUILD_TARGET= sub-src
--- 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
--- 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
--- 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,7 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2020/11/21 11:22:33 adam Exp $
+# $NetBSD: Makefile,v 1.22 2020/11/29 22:33:22 dbj Exp $
DISTNAME= qtnetworkauth-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtnetworkauth-${QTVERSION}
+PKGREVISION= 1
COMMENT= Qt5 module for networkauth framework
BUILD_TARGET= sub-src
--- 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,7 +1,8 @@
-# $NetBSD: Makefile,v 1.47 2020/11/21 11:22:33 adam Exp $
+# $NetBSD: Makefile,v 1.48 2020/11/29 22:33:22 dbj Exp $
DISTNAME= qtquickcontrols-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtquickcontrols-${QTVERSION}
+PKGREVISION= 1
COMMENT= Qt5 module for QuickControls
BUILD_TARGET= sub-src
--- 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,7 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2020/11/21 11:22:33 adam Exp $
+# $NetBSD: Makefile,v 1.30 2020/11/29 22:33:23 dbj Exp $
DISTNAME= qtquickcontrols2-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtquickcontrols2-${QTVERSION}
+PKGREVISION= 1
COMMENT= Next generation user interface controls based on Qt Quick
BUILD_TARGET= sub-src
--- 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,7 +1,8 @@
-# $NetBSD: Makefile,v 1.64 2020/11/21 11:22:33 adam Exp $
+# $NetBSD: Makefile,v 1.65 2020/11/29 22:33:23 dbj Exp $
DISTNAME= qtscript-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtscript-${QTVERSION}
+PKGREVISION= 1
COMMENT= Qt5 module for script
BUILD_TARGET= sub-src
--- 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,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2020/11/21 11:22:33 adam Exp $
+# $NetBSD: Makefile,v 1.14 2020/11/29 22:33:23 dbj Exp $
DISTNAME= qtscxml-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtscxml-${QTVERSION}
+PKGREVISION= 1
COMMENT= Qt5 module for scxml framework
BUILD_TARGET= sub-src
--- 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,7 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2020/11/21 11:22:33 adam Exp $
+# $NetBSD: Makefile,v 1.51 2020/11/29 22:33:23 dbj Exp $
DISTNAME= qtsensors-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtsensors-${QTVERSION}
+PKGREVISION= 1
COMMENT= Qt5 module for Sensors
BUILD_TARGET= sub-src
--- 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,7 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2020/11/21 11:22:34 adam Exp $
+# $NetBSD: Makefile,v 1.49 2020/11/29 22:33:23 dbj Exp $
DISTNAME= qtserialport-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtserialport-${QTVERSION}
+PKGREVISION= 1
COMMENT= Qt5 module for Serial Port
BUILD_TARGET= sub-src
--- 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,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2020/11/21 11:22:34 adam Exp $
+# $NetBSD: Makefile,v 1.17 2020/11/29 22:33:23 dbj Exp $
DISTNAME= qtspeech-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtspeech-${QTVERSION}
+PKGREVISION= 1
COMMENT= Qt5 module to make text to speech and speech recognition easy
MAKE_ENV+= QTDIR=${QTDIR}
--- 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,7 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2020/11/21 11:22:34 adam Exp $
+# $NetBSD: Makefile,v 1.49 2020/11/29 22:33:23 dbj Exp $
DISTNAME= qtsvg-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtsvg-${QTVERSION}
+PKGREVISION= 1
COMMENT= Qt5 module for SVG
BUILD_TARGET= sub-src
--- 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
--- 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,7 +1,8 @@
-# $NetBSD: Makefile,v 1.63 2020/11/21 11:22:34 adam Exp $
+# $NetBSD: Makefile,v 1.64 2020/11/29 22:33:23 dbj Exp $
DISTNAME= qttranslations-everywhere-src-${QTVERSION}
PKGNAME= qt5-qttranslations-${QTVERSION}
+PKGREVISION= 1
COMMENT= Qt5 translations
MAKE_ENV+= QTDIR=${QTDIR}
--- 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,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2020/11/21 11:22:34 adam Exp $
+# $NetBSD: Makefile,v 1.14 2020/11/29 22:33:24 dbj Exp $
DISTNAME= qtvirtualkeyboard-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtvirtualkeyboard-${QTVERSION}
+PKGREVISION= 2
COMMENT= Qt5 module for virtualkeyboard framework
BUILD_TARGET= sub-src
--- 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,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2020/11/21 11:22:34 adam Exp $
+# $NetBSD: Makefile,v 1.17 2020/11/29 22:33:24 dbj Exp $
DISTNAME= qtwayland-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtwayland-${QTVERSION}
+PKGREVISION= 1
COMMENT= Qt5 module for Wayland support
.include "../../devel/wayland/platform.mk"
--- 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,7 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2020/11/21 11:22:34 adam Exp $
+# $NetBSD: Makefile,v 1.45 2020/11/29 22:33:24 dbj Exp $
DISTNAME= qtwebchannel-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtwebchannel-${QTVERSION}
+PKGREVISION= 1
COMMENT= Qt5 WebChannel module
MAKE_ENV+= QTDIR=${QTDIR}
--- 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,7 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2020/11/21 11:22:35 adam Exp $
+# $NetBSD: Makefile,v 1.43 2020/11/29 22:33:24 dbj Exp $
DISTNAME= qtwebsockets-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtwebsockets-${QTVERSION}
+PKGREVISION= 1
COMMENT= Qt5 module for websockets
MAKE_ENV+= QTDIR=${QTDIR}
--- 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
--- 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,7 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2020/11/21 11:22:35 adam Exp $
+# $NetBSD: Makefile,v 1.49 2020/11/29 22:33:24 dbj Exp $
DISTNAME= qtxmlpatterns-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtxmlpatterns-${QTVERSION}
+PKGREVISION= 1
COMMENT= Qt5 module for XML Patterns
BUILD_TARGET= sub-tools