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 (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,43 +1,44 @@ @@ -1,43 +1,44 @@
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 \
38 ${DESTDIR}${PREFIX}/${PYSITELIB}/PyQt5/Qwt.so 39 ${DESTDIR}${PREFIX}/${PYSITELIB}/PyQt5/Qwt.so
39.endif 40.endif
40 41
41.include "../../lang/python/wheel.mk" 42.include "../../lang/python/wheel.mk"
42.include "../../x11/qwt6-qt5/buildlink3.mk" 43.include "../../x11/qwt6-qt5/buildlink3.mk"
43.include "../../mk/bsd.pkg.mk" 44.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/x11/py-qwt-qt5/PLIST (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,76 +1,76 @@ @@ -1,76 +1,76 @@
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
16${PYSITELIB}/PyQt5/bindings/Qwt/qwt_counter.sip 16${PYSITELIB}/PyQt5/bindings/Qwt/qwt_counter.sip
17${PYSITELIB}/PyQt5/bindings/Qwt/qwt_curve_fitter.sip 17${PYSITELIB}/PyQt5/bindings/Qwt/qwt_curve_fitter.sip
18${PYSITELIB}/PyQt5/bindings/Qwt/qwt_dial.sip 18${PYSITELIB}/PyQt5/bindings/Qwt/qwt_dial.sip
19${PYSITELIB}/PyQt5/bindings/Qwt/qwt_dial_needle.sip 19${PYSITELIB}/PyQt5/bindings/Qwt/qwt_dial_needle.sip
20${PYSITELIB}/PyQt5/bindings/Qwt/qwt_event_pattern.sip 20${PYSITELIB}/PyQt5/bindings/Qwt/qwt_event_pattern.sip
21${PYSITELIB}/PyQt5/bindings/Qwt/qwt_graphic.sip 21${PYSITELIB}/PyQt5/bindings/Qwt/qwt_graphic.sip
22${PYSITELIB}/PyQt5/bindings/Qwt/qwt_interval.sip 22${PYSITELIB}/PyQt5/bindings/Qwt/qwt_interval.sip
23${PYSITELIB}/PyQt5/bindings/Qwt/qwt_knob.sip 23${PYSITELIB}/PyQt5/bindings/Qwt/qwt_knob.sip
24${PYSITELIB}/PyQt5/bindings/Qwt/qwt_legend.sip 24${PYSITELIB}/PyQt5/bindings/Qwt/qwt_legend.sip
25${PYSITELIB}/PyQt5/bindings/Qwt/qwt_legend_data.sip 25${PYSITELIB}/PyQt5/bindings/Qwt/qwt_legend_data.sip
26${PYSITELIB}/PyQt5/bindings/Qwt/qwt_null_paintdevice.sip 26${PYSITELIB}/PyQt5/bindings/Qwt/qwt_null_paintdevice.sip
27${PYSITELIB}/PyQt5/bindings/Qwt/qwt_panner.sip 27${PYSITELIB}/PyQt5/bindings/Qwt/qwt_panner.sip
28${PYSITELIB}/PyQt5/bindings/Qwt/qwt_picker.sip 28${PYSITELIB}/PyQt5/bindings/Qwt/qwt_picker.sip
29${PYSITELIB}/PyQt5/bindings/Qwt/qwt_picker_machine.sip 29${PYSITELIB}/PyQt5/bindings/Qwt/qwt_picker_machine.sip
30${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot.sip 30${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot.sip
31${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_abstract_barchart.sip 31${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_abstract_barchart.sip
32${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_barchart.sip 32${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_barchart.sip
33${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_canvas.sip 33${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_canvas.sip
34${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_curve.sip 34${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_curve.sip
35${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_dict.sip 35${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_dict.sip
36${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_directpainter.sip 36${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_directpainter.sip
37${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_grid.sip 37${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_grid.sip
38${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_histogram.sip 38${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_histogram.sip
39${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_item.sip 39${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_item.sip
40${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_layout.sip 40${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_layout.sip
41${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_marker.sip 41${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_marker.sip
42${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_multi_barchart.sip 42${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_multi_barchart.sip
43${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_panner.sip 43${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_panner.sip
44${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_picker.sip 44${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_picker.sip
45${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_rasteritem.sip 45${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_rasteritem.sip
46${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_renderer.sip 46${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_renderer.sip
47${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_seriesitem.sip 47${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_seriesitem.sip
48${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_spectrogram.sip 48${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_spectrogram.sip
49${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_zoomer.sip 49${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_zoomer.sip
50${PYSITELIB}/PyQt5/bindings/Qwt/qwt_point_polar.sip 50${PYSITELIB}/PyQt5/bindings/Qwt/qwt_point_polar.sip
51${PYSITELIB}/PyQt5/bindings/Qwt/qwt_raster_data.sip 51${PYSITELIB}/PyQt5/bindings/Qwt/qwt_raster_data.sip
52${PYSITELIB}/PyQt5/bindings/Qwt/qwt_round_scale_draw.sip 52${PYSITELIB}/PyQt5/bindings/Qwt/qwt_round_scale_draw.sip
53${PYSITELIB}/PyQt5/bindings/Qwt/qwt_samples.sip 53${PYSITELIB}/PyQt5/bindings/Qwt/qwt_samples.sip
54${PYSITELIB}/PyQt5/bindings/Qwt/qwt_sampling_thread.sip 54${PYSITELIB}/PyQt5/bindings/Qwt/qwt_sampling_thread.sip
55${PYSITELIB}/PyQt5/bindings/Qwt/qwt_scale_div.sip 55${PYSITELIB}/PyQt5/bindings/Qwt/qwt_scale_div.sip
56${PYSITELIB}/PyQt5/bindings/Qwt/qwt_scale_draw.sip 56${PYSITELIB}/PyQt5/bindings/Qwt/qwt_scale_draw.sip
57${PYSITELIB}/PyQt5/bindings/Qwt/qwt_scale_engine.sip 57${PYSITELIB}/PyQt5/bindings/Qwt/qwt_scale_engine.sip
58${PYSITELIB}/PyQt5/bindings/Qwt/qwt_scale_map.sip 58${PYSITELIB}/PyQt5/bindings/Qwt/qwt_scale_map.sip
59${PYSITELIB}/PyQt5/bindings/Qwt/qwt_scale_widget.sip 59${PYSITELIB}/PyQt5/bindings/Qwt/qwt_scale_widget.sip
60${PYSITELIB}/PyQt5/bindings/Qwt/qwt_series_data.sip 60${PYSITELIB}/PyQt5/bindings/Qwt/qwt_series_data.sip
61${PYSITELIB}/PyQt5/bindings/Qwt/qwt_series_store.sip 61${PYSITELIB}/PyQt5/bindings/Qwt/qwt_series_store.sip
62${PYSITELIB}/PyQt5/bindings/Qwt/qwt_slider.sip 62${PYSITELIB}/PyQt5/bindings/Qwt/qwt_slider.sip
63${PYSITELIB}/PyQt5/bindings/Qwt/qwt_spline.sip 63${PYSITELIB}/PyQt5/bindings/Qwt/qwt_spline.sip
64${PYSITELIB}/PyQt5/bindings/Qwt/qwt_symbol.sip 64${PYSITELIB}/PyQt5/bindings/Qwt/qwt_symbol.sip
65${PYSITELIB}/PyQt5/bindings/Qwt/qwt_text.sip 65${PYSITELIB}/PyQt5/bindings/Qwt/qwt_text.sip
66${PYSITELIB}/PyQt5/bindings/Qwt/qwt_text_engine.sip 66${PYSITELIB}/PyQt5/bindings/Qwt/qwt_text_engine.sip
67${PYSITELIB}/PyQt5/bindings/Qwt/qwt_text_label.sip 67${PYSITELIB}/PyQt5/bindings/Qwt/qwt_text_label.sip
68${PYSITELIB}/PyQt5/bindings/Qwt/qwt_thermo.sip 68${PYSITELIB}/PyQt5/bindings/Qwt/qwt_thermo.sip
69${PYSITELIB}/PyQt5/bindings/Qwt/qwt_transform.sip 69${PYSITELIB}/PyQt5/bindings/Qwt/qwt_transform.sip
70${PYSITELIB}/PyQt5/bindings/Qwt/qwt_wheel.sip 70${PYSITELIB}/PyQt5/bindings/Qwt/qwt_wheel.sip
71${PYSITELIB}/${WHEEL_INFODIR}/INSTALLER 71${PYSITELIB}/${WHEEL_INFODIR}/INSTALLER
72${PYSITELIB}/${WHEEL_INFODIR}/METADATA 72${PYSITELIB}/${WHEEL_INFODIR}/METADATA
73${PYSITELIB}/${WHEEL_INFODIR}/RECORD 73${PYSITELIB}/${WHEEL_INFODIR}/RECORD
74${PYSITELIB}/${WHEEL_INFODIR}/REQUESTED 74${PYSITELIB}/${WHEEL_INFODIR}/REQUESTED
75${PYSITELIB}/${WHEEL_INFODIR}/WHEEL 75${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
76${PYSITELIB}/${WHEEL_INFODIR}/direct_url.json 76${PYSITELIB}/${WHEEL_INFODIR}/direct_url.json