[pkgsrc/trunk]: pkgsrc/x11 x11/qt5-*: avoid calling install_name_tool on syml...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/63558a3f02cd
branches:  trunk
changeset: 442747:63558a3f02cd
user:      dbj <dbj%pkgsrc.org@localhost>
date:      Sun Nov 29 22:33:21 2020 +0000

description:
x11/qt5-*: avoid calling install_name_tool on symlinks
otherwise, it converts symlinks to copies which creates
problems with duplicate dylibs at runtime

diffstat:

 x11/qt5-mysql/Makefile              |  3 ++-
 x11/qt5-odbc/Makefile               |  3 ++-
 x11/qt5-psql/Makefile               |  3 ++-
 x11/qt5-qtbase/Makefile             |  3 ++-
 x11/qt5-qtbase/Makefile.common      |  4 ++--
 x11/qt5-qtcharts/Makefile           |  3 ++-
 x11/qt5-qtconnectivity/Makefile     |  3 ++-
 x11/qt5-qtdeclarative/Makefile      |  3 ++-
 x11/qt5-qtdoc/Makefile              |  3 ++-
 x11/qt5-qtgraphicaleffects/Makefile |  3 ++-
 x11/qt5-qtimageformats/Makefile     |  3 ++-
 x11/qt5-qtlocation/Makefile         |  3 ++-
 x11/qt5-qtmacextras/Makefile        |  3 ++-
 x11/qt5-qtmultimedia/Makefile       |  3 ++-
 x11/qt5-qtnetworkauth/Makefile      |  3 ++-
 x11/qt5-qtquickcontrols/Makefile    |  3 ++-
 x11/qt5-qtquickcontrols2/Makefile   |  3 ++-
 x11/qt5-qtscript/Makefile           |  3 ++-
 x11/qt5-qtscxml/Makefile            |  3 ++-
 x11/qt5-qtsensors/Makefile          |  3 ++-
 x11/qt5-qtserialport/Makefile       |  3 ++-
 x11/qt5-qtspeech/Makefile           |  3 ++-
 x11/qt5-qtsvg/Makefile              |  3 ++-
 x11/qt5-qttools/Makefile            |  3 ++-
 x11/qt5-qttranslations/Makefile     |  3 ++-
 x11/qt5-qtvirtualkeyboard/Makefile  |  3 ++-
 x11/qt5-qtwayland/Makefile          |  3 ++-
 x11/qt5-qtwebchannel/Makefile       |  3 ++-
 x11/qt5-qtwebsockets/Makefile       |  3 ++-
 x11/qt5-qtx11extras/Makefile        |  3 ++-
 x11/qt5-qtxmlpatterns/Makefile      |  3 ++-
 31 files changed, 62 insertions(+), 32 deletions(-)

diffs (truncated from 408 to 300 lines):

diff -r a5441f8bcf0f -r 63558a3f02cd x11/qt5-mysql/Makefile
--- a/x11/qt5-mysql/Makefile    Sun Nov 29 22:32:17 2020 +0000
+++ b/x11/qt5-mysql/Makefile    Sun Nov 29 22:33:21 2020 +0000
@@ -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
diff -r a5441f8bcf0f -r 63558a3f02cd x11/qt5-odbc/Makefile
--- a/x11/qt5-odbc/Makefile     Sun Nov 29 22:32:17 2020 +0000
+++ b/x11/qt5-odbc/Makefile     Sun Nov 29 22:33:21 2020 +0000
@@ -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
diff -r a5441f8bcf0f -r 63558a3f02cd x11/qt5-psql/Makefile
--- a/x11/qt5-psql/Makefile     Sun Nov 29 22:32:17 2020 +0000
+++ b/x11/qt5-psql/Makefile     Sun Nov 29 22:33:21 2020 +0000
@@ -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
diff -r a5441f8bcf0f -r 63558a3f02cd x11/qt5-qtbase/Makefile
--- a/x11/qt5-qtbase/Makefile   Sun Nov 29 22:32:17 2020 +0000
+++ b/x11/qt5-qtbase/Makefile   Sun Nov 29 22:33:21 2020 +0000
@@ -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"
diff -r a5441f8bcf0f -r 63558a3f02cd x11/qt5-qtbase/Makefile.common
--- a/x11/qt5-qtbase/Makefile.common    Sun Nov 29 22:32:17 2020 +0000
+++ b/x11/qt5-qtbase/Makefile.common    Sun Nov 29 22:33:21 2020 +0000
@@ -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},,'`;     \
diff -r a5441f8bcf0f -r 63558a3f02cd x11/qt5-qtcharts/Makefile
--- a/x11/qt5-qtcharts/Makefile Sun Nov 29 22:32:17 2020 +0000
+++ b/x11/qt5-qtcharts/Makefile Sun Nov 29 22:33:21 2020 +0000
@@ -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
diff -r a5441f8bcf0f -r 63558a3f02cd x11/qt5-qtconnectivity/Makefile
--- a/x11/qt5-qtconnectivity/Makefile   Sun Nov 29 22:32:17 2020 +0000
+++ b/x11/qt5-qtconnectivity/Makefile   Sun Nov 29 22:33:21 2020 +0000
@@ -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
diff -r a5441f8bcf0f -r 63558a3f02cd x11/qt5-qtdeclarative/Makefile
--- a/x11/qt5-qtdeclarative/Makefile    Sun Nov 29 22:32:17 2020 +0000
+++ b/x11/qt5-qtdeclarative/Makefile    Sun Nov 29 22:33:21 2020 +0000
@@ -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
diff -r a5441f8bcf0f -r 63558a3f02cd x11/qt5-qtdoc/Makefile
--- a/x11/qt5-qtdoc/Makefile    Sun Nov 29 22:32:17 2020 +0000
+++ b/x11/qt5-qtdoc/Makefile    Sun Nov 29 22:33:21 2020 +0000
@@ -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}
diff -r a5441f8bcf0f -r 63558a3f02cd x11/qt5-qtgraphicaleffects/Makefile
--- a/x11/qt5-qtgraphicaleffects/Makefile       Sun Nov 29 22:32:17 2020 +0000
+++ b/x11/qt5-qtgraphicaleffects/Makefile       Sun Nov 29 22:33:21 2020 +0000
@@ -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
diff -r a5441f8bcf0f -r 63558a3f02cd x11/qt5-qtimageformats/Makefile
--- a/x11/qt5-qtimageformats/Makefile   Sun Nov 29 22:32:17 2020 +0000
+++ b/x11/qt5-qtimageformats/Makefile   Sun Nov 29 22:33:21 2020 +0000
@@ -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=      qtimageformats-everywhere-src-${QTVERSION}
 PKGNAME=       qt5-qtimageformats-${QTVERSION}
+PKGREVISION=   1
 COMMENT=       Qt5 module for Image formats
 
 BUILD_TARGET=          sub-src
diff -r a5441f8bcf0f -r 63558a3f02cd x11/qt5-qtlocation/Makefile
--- a/x11/qt5-qtlocation/Makefile       Sun Nov 29 22:32:17 2020 +0000
+++ b/x11/qt5-qtlocation/Makefile       Sun Nov 29 22:33:21 2020 +0000
@@ -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
diff -r a5441f8bcf0f -r 63558a3f02cd x11/qt5-qtmacextras/Makefile
--- a/x11/qt5-qtmacextras/Makefile      Sun Nov 29 22:32:17 2020 +0000
+++ b/x11/qt5-qtmacextras/Makefile      Sun Nov 29 22:33:21 2020 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2020/11/21 11:22:32 adam Exp $
+# $NetBSD: Makefile,v 1.43 2020/11/29 22:33:22 dbj Exp $
 
 DISTNAME=      qtmacextras-everywhere-src-${QTVERSION}
 PKGNAME=       qt5-qtmacextras-${QTVERSION}
+PKGREVISION=   1
 COMMENT=       Qt5 module for Mac extras
 
 BUILD_TARGET=          sub-src
diff -r a5441f8bcf0f -r 63558a3f02cd x11/qt5-qtmultimedia/Makefile
--- a/x11/qt5-qtmultimedia/Makefile     Sun Nov 29 22:32:17 2020 +0000
+++ b/x11/qt5-qtmultimedia/Makefile     Sun Nov 29 22:33:21 2020 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.72 2020/11/21 11:22:33 adam Exp $
+# $NetBSD: Makefile,v 1.73 2020/11/29 22:33:22 dbj Exp $
 
 DISTNAME=      qtmultimedia-everywhere-src-${QTVERSION}
 PKGNAME=       qt5-qtmultimedia-${QTVERSION}
+PKGREVISION=   1
 COMMENT=       Qt5 module for multimedia
 
 BUILD_TARGET=          sub-src
diff -r a5441f8bcf0f -r 63558a3f02cd x11/qt5-qtnetworkauth/Makefile
--- a/x11/qt5-qtnetworkauth/Makefile    Sun Nov 29 22:32:17 2020 +0000
+++ b/x11/qt5-qtnetworkauth/Makefile    Sun Nov 29 22:33:21 2020 +0000
@@ -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
diff -r a5441f8bcf0f -r 63558a3f02cd x11/qt5-qtquickcontrols/Makefile
--- a/x11/qt5-qtquickcontrols/Makefile  Sun Nov 29 22:32:17 2020 +0000
+++ b/x11/qt5-qtquickcontrols/Makefile  Sun Nov 29 22:33:21 2020 +0000
@@ -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
diff -r a5441f8bcf0f -r 63558a3f02cd x11/qt5-qtquickcontrols2/Makefile
--- a/x11/qt5-qtquickcontrols2/Makefile Sun Nov 29 22:32:17 2020 +0000
+++ b/x11/qt5-qtquickcontrols2/Makefile Sun Nov 29 22:33:21 2020 +0000
@@ -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
diff -r a5441f8bcf0f -r 63558a3f02cd x11/qt5-qtscript/Makefile
--- a/x11/qt5-qtscript/Makefile Sun Nov 29 22:32:17 2020 +0000
+++ b/x11/qt5-qtscript/Makefile Sun Nov 29 22:33:21 2020 +0000
@@ -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
diff -r a5441f8bcf0f -r 63558a3f02cd x11/qt5-qtscxml/Makefile
--- a/x11/qt5-qtscxml/Makefile  Sun Nov 29 22:32:17 2020 +0000
+++ b/x11/qt5-qtscxml/Makefile  Sun Nov 29 22:33:21 2020 +0000
@@ -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
diff -r a5441f8bcf0f -r 63558a3f02cd x11/qt5-qtsensors/Makefile
--- a/x11/qt5-qtsensors/Makefile        Sun Nov 29 22:32:17 2020 +0000
+++ b/x11/qt5-qtsensors/Makefile        Sun Nov 29 22:33:21 2020 +0000
@@ -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
diff -r a5441f8bcf0f -r 63558a3f02cd x11/qt5-qtserialport/Makefile
--- a/x11/qt5-qtserialport/Makefile     Sun Nov 29 22:32:17 2020 +0000
+++ b/x11/qt5-qtserialport/Makefile     Sun Nov 29 22:33:21 2020 +0000
@@ -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
diff -r a5441f8bcf0f -r 63558a3f02cd x11/qt5-qtspeech/Makefile
--- a/x11/qt5-qtspeech/Makefile Sun Nov 29 22:32:17 2020 +0000
+++ b/x11/qt5-qtspeech/Makefile Sun Nov 29 22:33:21 2020 +0000
@@ -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}
diff -r a5441f8bcf0f -r 63558a3f02cd x11/qt5-qtsvg/Makefile
--- a/x11/qt5-qtsvg/Makefile    Sun Nov 29 22:32:17 2020 +0000
+++ b/x11/qt5-qtsvg/Makefile    Sun Nov 29 22:33:21 2020 +0000
@@ -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}