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

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Oct  8 13:26:56 UTC 2022

Modified Files:
        pkgsrc/x11/py-qwt-qt5: Makefile PLIST distinfo
Removed Files:
        pkgsrc/x11/py-qwt-qt5/patches: patch-sip_qwt.sip
            patch-sip_qwt__transform.sip

Log Message:
py-qwt-qt5: updated to 1.02.02

Version 1.02.01
- Fix compilation with sip5
- Minor bugfixes in examples

Version 1.02.02
- sip-tool compilation added.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/py-qwt-qt5/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/py-qwt-qt5/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/py-qwt-qt5/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt.sip \
    pkgsrc/x11/py-qwt-qt5/patches/patch-sip_qwt__transform.sip

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.6 pkgsrc/x11/py-qwt-qt5/Makefile:1.7
--- pkgsrc/x11/py-qwt-qt5/Makefile:1.6  Sat May 14 17:00:25 2022
+++ pkgsrc/x11/py-qwt-qt5/Makefile      Sat Oct  8 13:26:55 2022
@@ -1,25 +1,22 @@
-# $NetBSD: Makefile,v 1.6 2022/05/14 17:00:25 tnn Exp $
+# $NetBSD: Makefile,v 1.7 2022/10/08 13:26:55 adam Exp $
 
-VERSION=       1.02.00
+VERSION=       1.02.02
 DISTNAME=      pyqt-qwt-${VERSION}
 PKGNAME=       ${PYPKGPREFIX}-qwt-qt5-${DISTNAME:S/pyqt-qwt-//}
-PKGREVISION=   4
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=GauiStori/}
 GITHUB_PROJECT=        PyQt-Qwt
-GITHUB_TAG=    pyqt-qwt-${VERSION}
+GITHUB_TAG=    v${VERSION}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://github.com/GauiStori/PyQt-Qwt/
+HOMEPAGE=      https://github.com/GauiStori/PyQt-Qwt
 COMMENT=       Python PyQt wrapper for Qwt6
-#LICENSE=      # gnu-lgpl-v2.1 with exception (Qwt License)
+LICENSE=       gnu-lgpl-v2.1 # with exception (Qwt License)
 
 BUILD_DEPENDS+=        qt5-qtbase-[0-9]*:../../x11/qt5-qtbase
 
-WRKSRC=                ${WRKDIR}/PyQt-Qwt-pyqt-qwt-${VERSION}
-
 CONFIGURE_ENV+=        QT_SELECT=qt5
-MAKE_ENV+=     PATH=${PATH}:${PREFIX}/qt5/bin
+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++
@@ -36,7 +33,7 @@ do-configure:
          --sip=${PREFIX}/bin/sip${PYVERSSUFFIX}                        \
          --qmake=${PREFIX}/qt5/bin/qmake                               \
          --pyqt-sipdir=${PREFIX}/share/sip${PYVERSSUFFIX}/PyQt5        \
-         --verbose
+         --no-qwt-api --verbose
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -44,8 +41,7 @@ do-configure:
 # clang: error: invalid argument '-bundle' not allowed with '-dynamiclib'
 BUILDLINK_TRANSFORM+=  rm:-bundle
 post-install:
-       install_name_tool       \
-               -id ${PREFIX}/${PYSITELIB}/PyQt5/Qwt.so \
+       install_name_tool -id ${PREFIX}/${PYSITELIB}/PyQt5/Qwt.so       \
          ${DESTDIR}${PREFIX}/${PYSITELIB}/PyQt5/Qwt.so
 .endif
 

Index: pkgsrc/x11/py-qwt-qt5/PLIST
diff -u pkgsrc/x11/py-qwt-qt5/PLIST:1.1 pkgsrc/x11/py-qwt-qt5/PLIST:1.2
--- pkgsrc/x11/py-qwt-qt5/PLIST:1.1     Sun Aug 30 08:21:15 2020
+++ pkgsrc/x11/py-qwt-qt5/PLIST Sat Oct  8 13:26:55 2022
@@ -1,12 +1,13 @@
-@comment $NetBSD: PLIST,v 1.1 2020/08/30 08:21:15 tnn Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/10/08 13:26:55 adam Exp $
 ${PYSITELIB}/PyQt5/Qwt.pyi
 ${PYSITELIB}/PyQt5/Qwt.so
-${PYSITELIB}/Qwt-6.1.2.dist-info/INSTALLER
-${PYSITELIB}/Qwt-6.1.2.dist-info/METADATA
-${PYSITELIB}/Qwt-6.1.2.dist-info/RECORD
+${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.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

Index: pkgsrc/x11/py-qwt-qt5/distinfo
diff -u pkgsrc/x11/py-qwt-qt5/distinfo:1.3 pkgsrc/x11/py-qwt-qt5/distinfo:1.4
--- pkgsrc/x11/py-qwt-qt5/distinfo:1.3  Tue Oct 26 11:34:20 2021
+++ pkgsrc/x11/py-qwt-qt5/distinfo      Sat Oct  8 13:26:55 2022
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 11:34:20 nia Exp $
+$NetBSD: distinfo,v 1.4 2022/10/08 13:26:55 adam Exp $
 
-BLAKE2s (pyqt-qwt-1.02.00.tar.gz) = 76f50d292845e1a6621cb414891da16bdbb7e77e512d9fa47690be85ad027181
-SHA512 (pyqt-qwt-1.02.00.tar.gz) = f2b54bd4097b726bcf4df897b910d49489efd2bc9d06d239037b0ecb7ed1420c76499e65b84a49efe2e8ba2313857ece92d8d50d157ccc38fda0cc0dac5ab178
-Size (pyqt-qwt-1.02.00.tar.gz) = 103588 bytes
-SHA1 (patch-mk__distinfo.py) = 180ce6d00f21142878f2a01805921d5c1fd63637
-SHA1 (patch-sip_qwt.sip) = f2491af157af22410ac78f1fb8bf05b332feb58e
-SHA1 (patch-sip_qwt__transform.sip) = 1e6f0e26e5cd5368bf39ce8ade529fef8464e34a
+BLAKE2s (pyqt-qwt-1.02.02.tar.gz) = 70ec253f564f0cbae48901c16a3a89b1c09d797a902cc38f94d8262f3f8736f9
+SHA512 (pyqt-qwt-1.02.02.tar.gz) = 2892827fb7e4e71c0f770ba481ef4653f2ef09a68767c178e4f810bb9c2f1e80362c7a37867c9b5d3525aed8118aef6c503ddc28323db02fe159055efed2a71d
+Size (pyqt-qwt-1.02.02.tar.gz) = 120948 bytes