py-qrcode: updated to 6.0

6.0:
- Fix optimize length being ignored in QRCode.add_data.
- Better calculation of the best mask pattern and related optimizations.

4 files changed, 27 insertions, 19 deletions

diff --git a/graphics/py-qrcode/ALTERNATIVES b/graphics/py-qrcode/ALTERNATIVES
index cb82100ea6a..ae63f29cb5a 100644
--- a/graphics/py-qrcode/ALTERNATIVES
+++ b/graphics/py-qrcode/ALTERNATIVES
@@ -1,2 +1,2 @@
-bin/qr @PREFIX@/bin/qr@PYVERSSUFFIX@
-@PKGMANDIR@/man1/qr.1 @PREFIX@/@PKGMANDIR/man1/qr@PYVERSSUFFIX@.1
+bin/qr @PREFIX@/bin/qr-@PYVERSSUFFIX@
+@PKGMANDIR@/man1/qr.1 @PREFIX@/@PKGMANDIR/man1/qr-@PYVERSSUFFIX@.1
diff --git a/graphics/py-qrcode/Makefile b/graphics/py-qrcode/Makefile
index 4c76c3733ed..7eed1d0e2e3 100644
--- a/graphics/py-qrcode/Makefile
+++ b/graphics/py-qrcode/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2018/07/04 13:40:21 jperkin Exp $
+# $NetBSD: Makefile,v 1.13 2018/10/07 08:55:13 adam Exp $
 
-DISTNAME=	qrcode-5.3
+DISTNAME=	qrcode-6.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	graphics
+CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_PYPI:=q/qrcode/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -10,15 +10,14 @@ HOMEPAGE=	https://pypi.python.org/pypi/qrcode
 COMMENT=	Python QR Code image generator
 LICENSE=	modified-bsd
 
-DEPENDS+=	${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml
 DEPENDS+=	${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow
+DEPENDS+=	${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
 USE_LANGUAGES=	# none
 
-PY_PATCHPLIST=	yes
+REPLACE_PYTHON+=	qrcode/console_scripts.py
 
-REPLACE_PYTHON+=		qrcode/console_scripts.py
 SUBST_CLASSES+=			pkgmandir
 SUBST_FILES.pkgmandir=		setup.py
 SUBST_MESSAGE.pkgmandir=	Fixing PKGMANDIR path.
@@ -27,9 +26,9 @@ SUBST_STAGE.pkgmandir=		pre-configure
 
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/bin/qr \
-		${DESTDIR}${PREFIX}/bin/qr${PYVERSSUFFIX} || ${TRUE}
+		${DESTDIR}${PREFIX}/bin/qr-${PYVERSSUFFIX} || ${TRUE}
 	${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/qr.1 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/qr${PYVERSSUFFIX}.1 || ${TRUE}
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/qr-${PYVERSSUFFIX}.1 || ${TRUE}
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
diff --git a/graphics/py-qrcode/PLIST b/graphics/py-qrcode/PLIST
index ff9ae4efaa9..e5dd81c06af 100644
--- a/graphics/py-qrcode/PLIST
+++ b/graphics/py-qrcode/PLIST
@@ -1,12 +1,15 @@
-@comment $NetBSD: PLIST,v 1.5 2018/01/01 18:33:33 rillig Exp $
-bin/qr${PYVERSSUFFIX}
+@comment $NetBSD: PLIST,v 1.6 2018/10/07 08:55:13 adam Exp $
+bin/qr-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
 ${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
-${PYSITELIB}/${EGG_INFODIR}/pbr.json
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
 ${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/qrcode/LUT.py
+${PYSITELIB}/qrcode/LUT.pyc
+${PYSITELIB}/qrcode/LUT.pyo
 ${PYSITELIB}/qrcode/__init__.py
 ${PYSITELIB}/qrcode/__init__.pyc
 ${PYSITELIB}/qrcode/__init__.pyo
@@ -40,6 +43,9 @@ ${PYSITELIB}/qrcode/image/svg.pyo
 ${PYSITELIB}/qrcode/main.py
 ${PYSITELIB}/qrcode/main.pyc
 ${PYSITELIB}/qrcode/main.pyo
+${PYSITELIB}/qrcode/release.py
+${PYSITELIB}/qrcode/release.pyc
+${PYSITELIB}/qrcode/release.pyo
 ${PYSITELIB}/qrcode/tests/__init__.py
 ${PYSITELIB}/qrcode/tests/__init__.pyc
 ${PYSITELIB}/qrcode/tests/__init__.pyo
@@ -52,10 +58,13 @@ ${PYSITELIB}/qrcode/tests/test_example.pyo
 ${PYSITELIB}/qrcode/tests/test_qrcode.py
 ${PYSITELIB}/qrcode/tests/test_qrcode.pyc
 ${PYSITELIB}/qrcode/tests/test_qrcode.pyo
+${PYSITELIB}/qrcode/tests/test_release.py
+${PYSITELIB}/qrcode/tests/test_release.pyc
+${PYSITELIB}/qrcode/tests/test_release.pyo
 ${PYSITELIB}/qrcode/tests/test_script.py
 ${PYSITELIB}/qrcode/tests/test_script.pyc
 ${PYSITELIB}/qrcode/tests/test_script.pyo
 ${PYSITELIB}/qrcode/util.py
 ${PYSITELIB}/qrcode/util.pyc
 ${PYSITELIB}/qrcode/util.pyo
-man/man1/qr${PYVERSSUFFIX}.1
+man/man1/qr-${PYVERSSUFFIX}.1
diff --git a/graphics/py-qrcode/distinfo b/graphics/py-qrcode/distinfo
index d9c4b9432d1..55928a0d4e5 100644
--- a/graphics/py-qrcode/distinfo
+++ b/graphics/py-qrcode/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2016/08/13 07:08:17 wen Exp $
+$NetBSD: distinfo,v 1.6 2018/10/07 08:55:13 adam Exp $
 
-SHA1 (qrcode-5.3.tar.gz) = f7d2f7f7868afbdcbc65bca12f0b79c020b74e08
-RMD160 (qrcode-5.3.tar.gz) = 9eedb3894a185ecbb9800cf8d4f7605a2794f2a3
-SHA512 (qrcode-5.3.tar.gz) = 325ffb3285a4f01f59b1c708a879d6465ad4c8d066b53a15545f381dbc8de7f0b28b3d7b925bac5367de436ababf1c25c75ddbf37066e17b02d68292edd0ef5e
-Size (qrcode-5.3.tar.gz) = 24253 bytes
+SHA1 (qrcode-6.0.tar.gz) = fac9dcc3b1c1ad9c0566875695e3b3b6afdb8dca
+RMD160 (qrcode-6.0.tar.gz) = 122b7727cd404246c86a34124ab0b8475ac99b2b
+SHA512 (qrcode-6.0.tar.gz) = c43f12fe6b12d244d19a994cfd20adbe3776bbda1459c9dbc6164b1c9e7637f05e2acc1c2d29b82243024a4ea9b46c319a56acdf6d05e7b697bcd2c31c02102e
+Size (qrcode-6.0.tar.gz) = 29160 bytes