Wed Dec 7 14:58:52 2022 UTC ()
py-qwt-qt5: try fixing PLIST for Python != 3.10


(wiz)
diff -r1.11 -r1.12 pkgsrc/x11/py-qwt-qt5/Makefile
diff -r1.3 -r1.4 pkgsrc/x11/py-qwt-qt5/PLIST
cvs diff -r1.11 -r1.12 pkgsrc/x11/py-qwt-qt5/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/py-qwt-qt5/Makefile 2022/12/02 15:53:28 1.11
+++ pkgsrc/x11/py-qwt-qt5/Makefile 2022/12/07 14:58:52 1.12
@@ -1,37 +1,38 @@ @@ -1,37 +1,38 @@
1# $NetBSD: Makefile,v 1.11 2022/12/02 15:53:28 wiz Exp $ 1# $NetBSD: Makefile,v 1.12 2022/12/07 14:58:52 wiz Exp $
2 2
3DISTNAME= pyqt-qwt-1.02.02 3DISTNAME= pyqt-qwt-1.02.02
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/pyqt-qwt/qwt-qt5/} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/pyqt-qwt/qwt-qt5/}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= x11 6CATEGORIES= x11
7MASTER_SITES= ${MASTER_SITE_GITHUB:=GauiStori/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=GauiStori/}
8GITHUB_PROJECT= PyQt-Qwt 8GITHUB_PROJECT= PyQt-Qwt
9GITHUB_TAG= v${PKGVERSION_NOREV} 9GITHUB_TAG= v${PKGVERSION_NOREV}
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://github.com/GauiStori/PyQt-Qwt 12HOMEPAGE= https://github.com/GauiStori/PyQt-Qwt
13COMMENT= Python PyQt wrapper for Qwt6 13COMMENT= Python PyQt wrapper for Qwt6
14LICENSE= gnu-lgpl-v2.1 # with exception (Qwt License) 14LICENSE= gnu-lgpl-v2.1 # with exception (Qwt License)
15 15
16TOOL_DEPENDS+= ${PYPKGPREFIX}-sip6-[0-9]*:../../x11/py-sip6 16TOOL_DEPENDS+= ${PYPKGPREFIX}-sip6-[0-9]*:../../x11/py-sip6
17TOOL_DEPENDS+= ${PYPKGPREFIX}-qt-builder-[0-9]*:../../x11/py-qt-builder 17TOOL_DEPENDS+= ${PYPKGPREFIX}-qt-builder-[0-9]*:../../x11/py-qt-builder
18DEPENDS+= ${PYPKGPREFIX}-qt5-[0-9]*:../../x11/py-qt5 18DEPENDS+= ${PYPKGPREFIX}-qt5-[0-9]*:../../x11/py-qt5
19# TODO: check if this is correct or should this be a full DEPENDS 19# TODO: check if this is correct or should this be a full DEPENDS
20BUILD_DEPENDS+= qt5-qtbase-[0-9]*:../../x11/qt5-qtbase 20BUILD_DEPENDS+= qt5-qtbase-[0-9]*:../../x11/qt5-qtbase
21 21
22PYTHON_VERSIONS_INCOMPATIBLE= 27 22PYTHON_VERSIONS_INCOMPATIBLE= 27
23 23
24WHEEL_NAME= PyQt_Qwt-${PKGVERSION_NOREV} 24WHEEL_NAME= PyQt_Qwt-${PKGVERSION_NOREV}
 25PLIST_SUBST+= PYVER=${PYVERSSUFFIX:S/.//g}
25 26
26USE_LANGUAGES= c++ 27USE_LANGUAGES= c++
27 28
28pre-configure: 29pre-configure:
29 ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/ 30 ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
30 31
31.include "../../mk/bsd.prefs.mk" 32.include "../../mk/bsd.prefs.mk"
32 33
33.if ${OPSYS} == "Darwin" 34.if ${OPSYS} == "Darwin"
34# clang: error: invalid argument '-bundle' not allowed with '-dynamiclib' 35# clang: error: invalid argument '-bundle' not allowed with '-dynamiclib'
35BUILDLINK_TRANSFORM+= rm:-bundle 36BUILDLINK_TRANSFORM+= rm:-bundle
36post-install: 37post-install:
37 install_name_tool -id ${PREFIX}/${PYSITELIB}/PyQt5/Qwt.so \ 38 install_name_tool -id ${PREFIX}/${PYSITELIB}/PyQt5/Qwt.so \
cvs diff -r1.3 -r1.4 pkgsrc/x11/py-qwt-qt5/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/py-qwt-qt5/PLIST 2022/12/02 15:36:05 1.3
+++ pkgsrc/x11/py-qwt-qt5/PLIST 2022/12/07 14:58:52 1.4
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1@comment $NetBSD: PLIST,v 1.3 2022/12/02 15:36:05 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.4 2022/12/07 14:58:52 wiz Exp $
2${PYSITELIB}/PyQt5/Qwt.cpython-310.so 2${PYSITELIB}/PyQt5/Qwt.cpython-${PYVER}.so
3${PYSITELIB}/PyQt5/bindings/Qwt/Qwt.toml 3${PYSITELIB}/PyQt5/bindings/Qwt/Qwt.toml
4${PYSITELIB}/PyQt5/bindings/Qwt/Qwt_Qt5.sip 4${PYSITELIB}/PyQt5/bindings/Qwt/Qwt_Qt5.sip
5${PYSITELIB}/PyQt5/bindings/Qwt/conversions.sip 5${PYSITELIB}/PyQt5/bindings/Qwt/conversions.sip
6${PYSITELIB}/PyQt5/bindings/Qwt/qmap_convert.sip 6${PYSITELIB}/PyQt5/bindings/Qwt/qmap_convert.sip
7${PYSITELIB}/PyQt5/bindings/Qwt/qwt_abstract_legend.sip 7${PYSITELIB}/PyQt5/bindings/Qwt/qwt_abstract_legend.sip
8${PYSITELIB}/PyQt5/bindings/Qwt/qwt_abstract_scale.sip 8${PYSITELIB}/PyQt5/bindings/Qwt/qwt_abstract_scale.sip
9${PYSITELIB}/PyQt5/bindings/Qwt/qwt_abstract_scale_draw.sip 9${PYSITELIB}/PyQt5/bindings/Qwt/qwt_abstract_scale_draw.sip
10${PYSITELIB}/PyQt5/bindings/Qwt/qwt_abstract_slider.sip 10${PYSITELIB}/PyQt5/bindings/Qwt/qwt_abstract_slider.sip
11${PYSITELIB}/PyQt5/bindings/Qwt/qwt_analog_clock.sip 11${PYSITELIB}/PyQt5/bindings/Qwt/qwt_analog_clock.sip
12${PYSITELIB}/PyQt5/bindings/Qwt/qwt_color_map.sip 12${PYSITELIB}/PyQt5/bindings/Qwt/qwt_color_map.sip
13${PYSITELIB}/PyQt5/bindings/Qwt/qwt_column_symbol.sip 13${PYSITELIB}/PyQt5/bindings/Qwt/qwt_column_symbol.sip
14${PYSITELIB}/PyQt5/bindings/Qwt/qwt_compass.sip 14${PYSITELIB}/PyQt5/bindings/Qwt/qwt_compass.sip
15${PYSITELIB}/PyQt5/bindings/Qwt/qwt_compass_rose.sip 15${PYSITELIB}/PyQt5/bindings/Qwt/qwt_compass_rose.sip