CVS commit: pkgsrc/x11/qwt6-qt5

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat May 14 16:18:30 UTC 2022

Modified Files:
        pkgsrc/x11/qwt6-qt5: Makefile buildlink3.mk

Log Message:
qwt6-qt5: libqwt.dylib needs rpath fixup


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/x11/qwt6-qt5/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/qwt6-qt5/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/qwt6-qt5/Makefile
diff -u pkgsrc/x11/qwt6-qt5/Makefile:1.22 pkgsrc/x11/qwt6-qt5/Makefile:1.23
--- pkgsrc/x11/qwt6-qt5/Makefile:1.22   Sat May 14 15:19:05 2022
+++ pkgsrc/x11/qwt6-qt5/Makefile        Sat May 14 16:18:30 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2022/05/14 15:19:05 tnn Exp $
+# $NetBSD: Makefile,v 1.23 2022/05/14 16:18:30 tnn Exp $
 
 DISTNAME=      qwt-6.1.5
 PKGNAME=       qwt6-qt5-6.1.5
-PKGREVISION=   10
+PKGREVISION=   11
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=qwt/}
 EXTRACT_SUFX=  .tar.bz2
@@ -34,7 +34,15 @@ do-configure:
 # already loaded, at least as used in qgis.
 CHECK_SHLIBS_SKIP+=    qt5/plugins/designer/libqwt_designer_plugin.so
 CHECK_SHLIBS_SKIP+=    qt5/plugins/designer/libqwt_designer_plugin.dylib
-CHECK_SHLIBS_SKIP+=    qwt-6.1.5/lib/libqwt.6.1.5.dylib
+
+.include "../../mk/bsd.prefs.mk"
+
+post-install:
+.if ${OPSYS} == "Darwin"
+       install_name_tool       \
+         -id       ${PREFIX}/qwt-${PKGVERSION_NOREV}/lib/qwt-${PKGVERSION_NOREV}/lib/libqwt.${PKGVERSION_NOREV}.dylib  \
+         ${DESTDIR}${PREFIX}/qwt-${PKGVERSION_NOREV}/lib/qwt-${PKGVERSION_NOREV}/lib/libqwt.${PKGVERSION_NOREV}.dylib
+.endif
 
 .include "../../x11/qt5-qttools/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"

Index: pkgsrc/x11/qwt6-qt5/buildlink3.mk
diff -u pkgsrc/x11/qwt6-qt5/buildlink3.mk:1.14 pkgsrc/x11/qwt6-qt5/buildlink3.mk:1.15
--- pkgsrc/x11/qwt6-qt5/buildlink3.mk:1.14      Mon Apr 18 19:10:18 2022
+++ pkgsrc/x11/qwt6-qt5/buildlink3.mk   Sat May 14 16:18:30 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2022/04/18 19:10:18 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2022/05/14 16:18:30 tnn Exp $
 
 BUILDLINK_TREE+=       qwt6-qt5
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        qwt6-qt5
 QWT6_QT5_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qwt6-qt5+=       qwt6-qt5>=6.1.5
-BUILDLINK_ABI_DEPENDS.qwt6-qt5?=               qwt6-qt5>=6.1.5nb10
+BUILDLINK_ABI_DEPENDS.qwt6-qt5?=       qwt6-qt5>=6.1.5nb10
 BUILDLINK_PKGSRCDIR.qwt6-qt5?=         ../../x11/qwt6-qt5
 
 QWT_DIR=                       ${BUILDLINK_PREFIX.qwt6-qt5}/qwt-6.1.5