CVS commit: pkgsrc/x11/py-qwt-qt5

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Aug 27 02:54:37 UTC 2023

Modified Files:
        pkgsrc/x11/py-qwt-qt5: Makefile PLIST

Log Message:
py-qwt-qt5: fix DEPENDS and install_name_tool part


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/py-qwt-qt5/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/py-qwt-qt5/PLIST

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

Modified files:

Index: pkgsrc/x11/py-qwt-qt5/Makefile
diff -u pkgsrc/x11/py-qwt-qt5/Makefile:1.17 pkgsrc/x11/py-qwt-qt5/Makefile:1.18
--- pkgsrc/x11/py-qwt-qt5/Makefile:1.17 Tue Jun  6 12:42:55 2023
+++ pkgsrc/x11/py-qwt-qt5/Makefile      Sun Aug 27 02:54:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2023/06/06 12:42:55 riastradh Exp $
+# $NetBSD: Makefile,v 1.18 2023/08/27 02:54:37 adam Exp $
 
 DISTNAME=      pyqt-qwt-1.02.02
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/pyqt-qwt/qwt-qt5/}
@@ -16,13 +16,11 @@ LICENSE=    gnu-lgpl-v2.1 # with exception 
 TOOL_DEPENDS+= ${PYPKGPREFIX}-sip6-[0-9]*:../../x11/py-sip6
 TOOL_DEPENDS+= ${PYPKGPREFIX}-qt-builder-[0-9]*:../../x11/py-qt-builder
 DEPENDS+=      ${PYPKGPREFIX}-qt5-[0-9]*:../../x11/py-qt5
-# TODO: check if this is correct or should this be a full DEPENDS
-TOOL_DEPENDS+= qt5-qtbase-[0-9]*:../../x11/qt5-qtbase
+DEPENDS+=      ${PYPKGPREFIX}-sip-qt5>=12:../../x11/py-sip-qt5
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 WHEEL_NAME=    PyQt_Qwt-${PKGVERSION_NOREV}
-PLIST_SUBST+=  PYVER=${PYVERSSUFFIX:S/.//g}
 
 USE_LANGUAGES= c++
 
@@ -32,11 +30,9 @@ pre-configure:
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "Darwin"
-# clang: error: invalid argument '-bundle' not allowed with '-dynamiclib'
-BUILDLINK_TRANSFORM+=  rm:-bundle
 post-install:
-       install_name_tool -id ${PREFIX}/${PYSITELIB}/PyQt5/Qwt.so       \
-         ${DESTDIR}${PREFIX}/${PYSITELIB}/PyQt5/Qwt.so
+       install_name_tool -id ${PREFIX}/${PYSITELIB}/PyQt5/Qwt.abi3.so \
+               ${DESTDIR}${PREFIX}/${PYSITELIB}/PyQt5/Qwt.abi3.so
 .endif
 
 .include "../../lang/python/wheel.mk"

Index: pkgsrc/x11/py-qwt-qt5/PLIST
diff -u pkgsrc/x11/py-qwt-qt5/PLIST:1.5 pkgsrc/x11/py-qwt-qt5/PLIST:1.6
--- pkgsrc/x11/py-qwt-qt5/PLIST:1.5     Sun Aug 13 03:59:49 2023
+++ pkgsrc/x11/py-qwt-qt5/PLIST Sun Aug 27 02:54:37 2023
@@ -1,4 +1,10 @@
-@comment $NetBSD: PLIST,v 1.5 2023/08/13 03:59:49 mef Exp $
+@comment $NetBSD: PLIST,v 1.6 2023/08/27 02:54:37 adam Exp $
+${PYSITELIB}/${WHEEL_INFODIR}/INSTALLER
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/REQUESTED
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/direct_url.json
 ${PYSITELIB}/PyQt5/Qwt.abi3.so
 ${PYSITELIB}/PyQt5/bindings/Qwt/Qwt.toml
 ${PYSITELIB}/PyQt5/bindings/Qwt/Qwt_Qt5.sip
@@ -68,9 +74,3 @@ ${PYSITELIB}/PyQt5/bindings/Qwt/qwt_text
 ${PYSITELIB}/PyQt5/bindings/Qwt/qwt_thermo.sip
 ${PYSITELIB}/PyQt5/bindings/Qwt/qwt_transform.sip
 ${PYSITELIB}/PyQt5/bindings/Qwt/qwt_wheel.sip
-${PYSITELIB}/${WHEEL_INFODIR}/INSTALLER
-${PYSITELIB}/${WHEEL_INFODIR}/METADATA
-${PYSITELIB}/${WHEEL_INFODIR}/RECORD
-${PYSITELIB}/${WHEEL_INFODIR}/REQUESTED
-${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
-${PYSITELIB}/${WHEEL_INFODIR}/direct_url.json