From cdf37c9add036f4c56dc0177e0f677aecac4f174 Mon Sep 17 00:00:00 2001
From: rodent <rodent>
Date: Sun, 9 Nov 2014 16:52:14 +0000
Subject: Version 5.1

pkgsrc changes
--------------
Fix Python interpreter in installed file. Rename bin and man files using
PYVERSSUFFIX in post-install. Add ALTERNATIVES file. Fix PKGMANDIR in setup.py.

ChangeLog
===========

* Make ``qr`` script work in Windows.
* Fixed print_ascii function in Python 3.
* Out-of-bounds code version numbers are handled more consistently with a
  ValueError.
* Much better test coverage (now only officially supporting Python 2.6+)
---
 graphics/py-qrcode/ALTERNATIVES |  2 ++
 graphics/py-qrcode/Makefile     | 21 +++++++++++++++++++--
 graphics/py-qrcode/PLIST        | 34 ++++++++++++++++++++++------------
 graphics/py-qrcode/distinfo     |  8 ++++----
 4 files changed, 47 insertions(+), 18 deletions(-)
 create mode 100644 graphics/py-qrcode/ALTERNATIVES

(limited to 'graphics/py-qrcode')

diff --git a/graphics/py-qrcode/ALTERNATIVES b/graphics/py-qrcode/ALTERNATIVES
new file mode 100644
index 00000000000..cb82100ea6a
--- /dev/null
+++ b/graphics/py-qrcode/ALTERNATIVES
@@ -0,0 +1,2 @@
+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 390cac70e36..7db37a2c903 100644
--- a/graphics/py-qrcode/Makefile
+++ b/graphics/py-qrcode/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2014/07/16 23:36:23 rodent Exp $
+# $NetBSD: Makefile,v 1.3 2014/11/09 16:52:14 rodent Exp $
 
-DISTNAME=	qrcode-5.0.1
+DISTNAME=	qrcode-5.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	graphics
 MASTER_SITES=	https://pypi.python.org/packages/source/q/qrcode/
@@ -16,5 +16,22 @@ DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
 USE_LANGUAGES=	# none
 
+PY_PATCHPLIST=	yes
+PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
+
+REPLACE_PYTHON+=		qrcode/console_scripts.py
+SUBST_CLASSES+=			pkgmandir
+SUBST_FILES.pkgmandir=		setup.py
+SUBST_MESSAGE.pkgmandir=	Fixing PKGMANDIR path.
+SUBST_SED.pkgmandir=		-e "s|share/man|${PKGMANDIR}|1"
+SUBST_STAGE.pkgmandir=		post-patch
+
+post-install:
+	${MV} ${DESTDIR}${PREFIX}/bin/qr \
+		${DESTDIR}${PREFIX}/bin/qr${PYVERSSUFFIX}
+	${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/qr.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/qr${PYVERSSUFFIX}.1
+
+.include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-qrcode/PLIST b/graphics/py-qrcode/PLIST
index 5d0a1faf90a..c9e8c60a11f 100644
--- a/graphics/py-qrcode/PLIST
+++ b/graphics/py-qrcode/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2014/07/16 23:36:23 rodent Exp $
-bin/qr
+@comment $NetBSD: PLIST,v 1.3 2014/11/09 16:52:14 rodent 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}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/qrcode/__init__.py
@@ -11,6 +12,9 @@ ${PYSITELIB}/qrcode/__init__.pyo
 ${PYSITELIB}/qrcode/base.py
 ${PYSITELIB}/qrcode/base.pyc
 ${PYSITELIB}/qrcode/base.pyo
+${PYSITELIB}/qrcode/console_scripts.py
+${PYSITELIB}/qrcode/console_scripts.pyc
+${PYSITELIB}/qrcode/console_scripts.pyo
 ${PYSITELIB}/qrcode/constants.py
 ${PYSITELIB}/qrcode/constants.pyc
 ${PYSITELIB}/qrcode/constants.pyo
@@ -35,16 +39,22 @@ ${PYSITELIB}/qrcode/image/svg.pyo
 ${PYSITELIB}/qrcode/main.py
 ${PYSITELIB}/qrcode/main.pyc
 ${PYSITELIB}/qrcode/main.pyo
-${PYSITELIB}/qrcode/mecard.py
-${PYSITELIB}/qrcode/mecard.pyc
-${PYSITELIB}/qrcode/mecard.pyo
-${PYSITELIB}/qrcode/speedy.py
-${PYSITELIB}/qrcode/speedy.pyc
-${PYSITELIB}/qrcode/speedy.pyo
-${PYSITELIB}/qrcode/tests.py
-${PYSITELIB}/qrcode/tests.pyc
-${PYSITELIB}/qrcode/tests.pyo
+${PYSITELIB}/qrcode/tests/__init__.py
+${PYSITELIB}/qrcode/tests/__init__.pyc
+${PYSITELIB}/qrcode/tests/__init__.pyo
+${PYSITELIB}/qrcode/tests/svg.py
+${PYSITELIB}/qrcode/tests/svg.pyc
+${PYSITELIB}/qrcode/tests/svg.pyo
+${PYSITELIB}/qrcode/tests/test_example.py
+${PYSITELIB}/qrcode/tests/test_example.pyc
+${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_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
-share/man/man1/qr.1
+${PKGMANDIR}/man1/qr${PYVERSSUFFIX}.1
diff --git a/graphics/py-qrcode/distinfo b/graphics/py-qrcode/distinfo
index da96fd8c7be..997cb7e40f1 100644
--- a/graphics/py-qrcode/distinfo
+++ b/graphics/py-qrcode/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2014/07/16 23:36:23 rodent Exp $
+$NetBSD: distinfo,v 1.3 2014/11/09 16:52:14 rodent Exp $
 
-SHA1 (qrcode-5.0.1.tar.gz) = ac89d395d578b9e4c0f05884f649a9135962c4bc
-RMD160 (qrcode-5.0.1.tar.gz) = 4b79d1be2088884b2e9273b787c6d5bceaf5a437
-Size (qrcode-5.0.1.tar.gz) = 20546 bytes
+SHA1 (qrcode-5.1.tar.gz) = 686d017fb655fa2f1d600b1a8672f5ee538ec2d6
+RMD160 (qrcode-5.1.tar.gz) = 41a425a64540be4b3cd3ba697e2cb78910cb1a6f
+Size (qrcode-5.1.tar.gz) = 22259 bytes
-- 
cgit v1.2.3