git: 36e2490a420c - main - graphics/qtqr: Update to 2.1

From: Emanuel Haupt <ehaupt_at_FreeBSD.org>
Date: Thu, 01 May 2025 07:35:11 UTC
The branch main has been updated by ehaupt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=36e2490a420c3668c3b42d088cb8089c36d4f3b0

commit 36e2490a420c3668c3b42d088cb8089c36d4f3b0
Author:     Alastair Hogge <agh@riseup.net>
AuthorDate: 2025-05-01 07:34:12 +0000
Commit:     Emanuel Haupt <ehaupt@FreeBSD.org>
CommitDate: 2025-05-01 07:35:01 +0000

    graphics/qtqr: Update to 2.1
    
    * Update to 2.1:
    * Replace ${PYNUMPY} in ${BUILD_DEPENDS} with the Port Origin, this
      enables graphics/qtqr to build with py-numpy-2.2.4
    * port{clippy|fmt|lint} maintenance
    * Use ${DISTVERSION} over ${PORTVERSION}
    
    PR:             286414
---
 graphics/qtqr/Makefile | 25 +++++++++++++++----------
 graphics/qtqr/distinfo |  6 +++---
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/graphics/qtqr/Makefile b/graphics/qtqr/Makefile
index ad6c251ebdf1..4774bebe1851 100644
--- a/graphics/qtqr/Makefile
+++ b/graphics/qtqr/Makefile
@@ -1,10 +1,10 @@
 PORTNAME=	qtqr
-DISTVERSION=	2.0.bzr39
-PORTREVISION=	12
+DISTVERSION=	2.1
 CATEGORIES=	graphics python
-MASTER_SITES=	LOCAL/ehaupt
+MASTER_SITES=	https://launchpad.net/qr-tools/2.0/${PORTVERSION}/+download/ \
+		LOCAL/ehaupt
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	qr-tools-${DISTVERSION}
+DISTFILES=	${PORTNAME}_${PORTVERSION}-0~47~ubuntu24.04.1${EXTRACT_SUFX}
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	GUI that makes it easy to create and decode QR codes
@@ -13,7 +13,7 @@ WWW=		https://launchpad.net/qr-tools
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
-RUN_DEPENDS=	${PYNUMPY} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zbar-py>=1.0.4:graphics/py-zbar-py@${PY_FLAVOR}
 
@@ -28,14 +28,19 @@ NO_BUILD=	yes
 OPTIONS_DEFINE=	EXAMPLES
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/qtqr.py ${STAGEDIR}${PREFIX}/bin/qtqr
-	${INSTALL_DATA} ${WRKSRC}/icon.png ${STAGEDIR}${PREFIX}/share/pixmaps/qtqr.png
-	${INSTALL_DATA} ${WRKSRC}/qtqr.desktop ${STAGEDIR}${DESKTOPDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/qtqr.py \
+		${STAGEDIR}${PREFIX}/bin/qtqr
+	${INSTALL_DATA} ${WRKSRC}/icon.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/qtqr.png
+	${INSTALL_DATA} ${WRKSRC}/debian/qtqr.desktop \
+		${STAGEDIR}${DESKTOPDIR}
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/qt5/translations
-	${INSTALL_DATA} ${WRKSRC}/*.qm ${STAGEDIR}${PREFIX}/share/qt5/translations
+	${INSTALL_DATA} ${WRKSRC}/*.qm \
+		${STAGEDIR}${PREFIX}/share/qt5/translations
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/samples/* ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/samples/* \
+		${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/qtqr/distinfo b/graphics/qtqr/distinfo
index ffdb272542e1..5932a5d009e4 100644
--- a/graphics/qtqr/distinfo
+++ b/graphics/qtqr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1595005514
-SHA256 (qr-tools-2.0.bzr39.tar.gz) = 435d399839dedb93670bf85a306ac004fac4cc553f1de226fe0b769921b7224e
-SIZE (qr-tools-2.0.bzr39.tar.gz) = 280645
+TIMESTAMP = 1745658159
+SHA256 (qtqr_2.1-0~47~ubuntu24.04.1.tar.gz) = bcad4aa7b677c3cce34381f2acb3fc0de33216f8380af3c0365424f4cfdf6d44
+SIZE (qtqr_2.1-0~47~ubuntu24.04.1.tar.gz) = 99156