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

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Dec  2 15:36:05 UTC 2022

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

Log Message:
py-qwt-qt5: switch to py-sip6

Simplify, use wheel.mk.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/py-qwt-qt5/Makefile
cvs rdiff -u -r1.2 -r1.3 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.9 pkgsrc/x11/py-qwt-qt5/Makefile:1.10
--- pkgsrc/x11/py-qwt-qt5/Makefile:1.9  Fri Nov 25 13:31:35 2022
+++ pkgsrc/x11/py-qwt-qt5/Makefile      Fri Dec  2 15:36:04 2022
@@ -1,42 +1,30 @@
-# $NetBSD: Makefile,v 1.9 2022/11/25 13:31:35 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2022/12/02 15:36:04 wiz Exp $
 
-VERSION=       1.02.02
-DISTNAME=      pyqt-qwt-${VERSION}
-PKGNAME=       ${PYPKGPREFIX}-qwt-qt5-${DISTNAME:S/pyqt-qwt-//}
-PKGREVISION=   1
+DISTNAME=      pyqt-qwt-1.02.02
+PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/pyqt-qwt/qwt-qt5/}
+PKGREVISION=   2
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=GauiStori/}
 GITHUB_PROJECT=        PyQt-Qwt
-GITHUB_TAG=    v${VERSION}
+GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/GauiStori/PyQt-Qwt
 COMMENT=       Python PyQt wrapper for Qwt6
 LICENSE=       gnu-lgpl-v2.1 # with exception (Qwt License)
 
+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
 BUILD_DEPENDS+=        qt5-qtbase-[0-9]*:../../x11/qt5-qtbase
 
-CONFIGURE_ENV+=        QT_SELECT=qt5
-MAKE_ENV+=     PATH=${PATH:Q}:${PREFIX}/qt5/bin
-INSTALL_ENV+=  INSTALL_ROOT=${DESTDIR}
-ALL_ENV+=      LFLAGS=${COMPILER_RPATH_FLAG}${PREFIX}/${BUILDLINK_LIBDIRS.qwt6-qt5}
-USE_LANGUAGES= c++
-
-PY_PATCHPLIST= yes
+WHEEL_NAME=    PyQt_Qwt-${PKGVERSION_NOREV}
 
-PYTHON_VERSIONS_INCOMPATIBLE+= 311 # py-sip
+USE_LANGUAGES= c++
 
-do-configure:
-       set -e; cd ${WRKSRC};                                           \
-         ${PKGSRC_SETENV} ${CONFIGURE_ENV}                             \
-         ${PYTHONBIN} configure.py                                     \
-         --qwt-incdir=${PREFIX}/${BUILDLINK_INCDIRS.qwt6-qt5}          \
-         --qwt-libdir=${PREFIX}/${BUILDLINK_LIBDIRS.qwt6-qt5}          \
-         --qwt-lib=qwt                                                 \
-         --sip=${PREFIX}/bin/sip${PYVERSSUFFIX}                        \
-         --qmake=${PREFIX}/qt5/bin/qmake                               \
-         --pyqt-sipdir=${PREFIX}/share/sip${PYVERSSUFFIX}/PyQt5        \
-         --no-qwt-api --verbose
+pre-configure:
+       ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -48,8 +36,6 @@ post-install:
          ${DESTDIR}${PREFIX}/${PYSITELIB}/PyQt5/Qwt.so
 .endif
 
-.include "../../lang/python/extension.mk"
-.include "../../x11/py-qt5/buildlink3.mk"
-.include "../../x11/py-sip/buildlink3.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../x11/qwt6-qt5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/py-qwt-qt5/PLIST
diff -u pkgsrc/x11/py-qwt-qt5/PLIST:1.2 pkgsrc/x11/py-qwt-qt5/PLIST:1.3
--- pkgsrc/x11/py-qwt-qt5/PLIST:1.2     Sat Oct  8 13:26:55 2022
+++ pkgsrc/x11/py-qwt-qt5/PLIST Fri Dec  2 15:36:05 2022
@@ -1,75 +1,76 @@
-@comment $NetBSD: PLIST,v 1.2 2022/10/08 13:26:55 adam Exp $
-${PYSITELIB}/PyQt5/Qwt.pyi
-${PYSITELIB}/PyQt5/Qwt.so
-${PYSITELIB}/Qwt-1.02.02.dist-info/INSTALLER
-${PYSITELIB}/Qwt-1.02.02.dist-info/METADATA
-${PYSITELIB}/Qwt-1.02.02.dist-info/RECORD
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/Qwt_Qt4.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/Qwt_Qt5.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/conversions.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qmap_convert.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_abstract_legend.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_abstract_scale.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_abstract_scale_draw.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_abstract_slider.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_analog_clock.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_color_map.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_column_symbol.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_compass.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_compass_rose.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_counter.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_curve_fitter.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_dial.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_dial_needle.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_event_pattern.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_graphic.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_interval.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_knob.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_legend.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_legend_data.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_null_paintdevice.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_panner.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_picker.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_picker_machine.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_abstract_barchart.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_barchart.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_canvas.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_curve.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_dict.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_directpainter.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_grid.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_histogram.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_item.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_layout.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_marker.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_multi_barchart.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_panner.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_picker.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_rasteritem.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_renderer.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_seriesitem.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_spectrogram.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_plot_zoomer.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_point_data.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_point_polar.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_raster_data.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_round_scale_draw.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_samples.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_sampling_thread.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_scale_div.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_scale_draw.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_scale_engine.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_scale_map.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_scale_widget.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_series_data.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_series_store.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_slider.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_spline.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_symbol.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_text.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_text_engine.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_text_label.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_thermo.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_transform.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qwt/qwt_wheel.sip
+@comment $NetBSD: PLIST,v 1.3 2022/12/02 15:36:05 wiz Exp $
+${PYSITELIB}/PyQt5/Qwt.cpython-310.so
+${PYSITELIB}/PyQt5/bindings/Qwt/Qwt.toml
+${PYSITELIB}/PyQt5/bindings/Qwt/Qwt_Qt5.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/conversions.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qmap_convert.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_abstract_legend.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_abstract_scale.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_abstract_scale_draw.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_abstract_slider.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_analog_clock.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_color_map.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_column_symbol.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_compass.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_compass_rose.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_counter.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_curve_fitter.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_dial.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_dial_needle.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_event_pattern.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_graphic.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_interval.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_knob.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_legend.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_legend_data.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_null_paintdevice.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_panner.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_picker.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_picker_machine.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_abstract_barchart.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_barchart.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_canvas.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_curve.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_dict.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_directpainter.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_grid.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_histogram.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_item.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_layout.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_marker.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_multi_barchart.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_panner.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_picker.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_rasteritem.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_renderer.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_seriesitem.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_spectrogram.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_plot_zoomer.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_point_polar.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_raster_data.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_round_scale_draw.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_samples.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_sampling_thread.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_scale_div.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_scale_draw.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_scale_engine.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_scale_map.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_scale_widget.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_series_data.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_series_store.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_slider.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_spline.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_symbol.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_text.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_text_engine.sip
+${PYSITELIB}/PyQt5/bindings/Qwt/qwt_text_label.sip
+${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