py-zfec: updated to 1.5.3

Release 1.5.3:

** Fix setup.py problem that broke builds on slackware (or other systems with
   setuptools-22.0.5, which is too old to know that "name" might come from
   the setup.cfg metadata section)

Release 1.5.2:
** Add Appveyor (CI for Windows)
** Use older C syntax to appease the Windows compilers we use on Appveyor.
   The previous release just didn't compile there, which broke Tahoe builds.

Release 1.5.1:
** stop using PBR, it interacts badly with Versioneer, causing bad version
   strings like "0+unknown" after pip install

Release 1.5.0:
** Add support for python3.5/3.6/3.7
** switch to PBR for packagine
** fix unclosed-file and illegal-seek errors
** fix memory leak in fec.c
** remove unused stdeb.cfg

5 files changed, 35 insertions, 54 deletions

diff --git a/converters/py-zfec/ALTERNATIVES b/converters/py-zfec/ALTERNATIVES
new file mode 100644
index 00000000000..8a839aa4f57
--- /dev/null
+++ b/converters/py-zfec/ALTERNATIVES
@@ -0,0 +1,2 @@
+bin/zfec @PREFIX@/bin/zfec-@PYVERSSUFFIX@
+bin/zunfec @PREFIX@/bin/zunfec-@PYVERSSUFFIX@
diff --git a/converters/py-zfec/Makefile b/converters/py-zfec/Makefile
index f88a7302b2a..641f20d7f1d 100644
--- a/converters/py-zfec/Makefile
+++ b/converters/py-zfec/Makefile
@@ -1,31 +1,35 @@
-# $NetBSD: Makefile,v 1.24 2019/11/03 17:14:25 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2020/06/29 15:55:52 adam Exp $
 
-DISTNAME=	zfec-1.4.24
+DISTNAME=	zfec-1.5.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	2
-CATEGORIES=	converters
+CATEGORIES=	converters python
 MASTER_SITES=	${MASTER_SITE_PYPI:=z/zfec/}
 
 MAINTAINER=	gdt@ir.bbn.com
-HOMEPAGE=	https://pypi.python.org/pypi/zfec/
-COMMENT=	Fast erasure codec
+HOMEPAGE=	https://github.com/tahoe-lafs/zfec
+COMMENT=	Efficient, portable erasure coding tool
 LICENSE=	gnu-gpl-v2
 
-BUILD_DEPENDS+=	${PYPKGPREFIX}-darcsver-[0-9]*:../../devel/py-darcsver
-
-DEPENDS+=	${PYPKGPREFIX}-argparse-[0-9]*:../../devel/py-argparse
-DEPENDS+=	${PYPKGPREFIX}-setuptools_trial-[0-9]*:../../devel/py-setuptools_trial
-DEPENDS+=	${PYPKGPREFIX}-pyutil>=1.3.19:../../devel/py-pyutil
 DEPENDS+=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-
-CFLAGS.SunOS+=	-std=c99 -D_XOPEN_SOURCE=600
-
-REPLACE_INTERPRETER+=	python
-REPLACE.python.old=	/usr/bin/env python
-REPLACE.python.new=	${PYTHONBIN}
-REPLACE_FILES.python=	zfec/cmdline_zfec.py zfec/cmdline_zunfec.py zfec/test/test_zfec.py
-
-PYTHON_VERSIONS_ACCEPTED=	27 # py-darcsver
-
+DEPENDS+=	${PYPKGPREFIX}-pyutil>=3.0.0:../../devel/py-pyutil
+TEST_DEPENDS+=	${PYPKGPREFIX}-setuptools_trial-[0-9]*:../../devel/py-setuptools_trial
+TEST_DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
+
+.include "../../lang/python/pyversion.mk"
+.if ${_PYTHON_VERSION} == 27
+DEPENDS+=	${PYPKGPREFIX}-argparse>=0.8:../../devel/py-argparse
+.endif
+
+REPLACE_PYTHON+=	zfec/cmdline_zfec.py
+REPLACE_PYTHON+=	zfec/cmdline_zunfec.py
+REPLACE_PYTHON+=	zfec/test/test_zfec.py
+
+post-install:
+.for bin in zfec zunfec
+	cd ${DESTDIR}${PREFIX}/bin && \
+	${MV} ${bin} ${bin}-${PYVERSSUFFIX} || ${TRUE}
+.endfor
+
+.include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/py-zfec/PLIST b/converters/py-zfec/PLIST
index 6c48716491d..c7a79bfa623 100644
--- a/converters/py-zfec/PLIST
+++ b/converters/py-zfec/PLIST
@@ -1,13 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2012/02/12 19:55:09 gls Exp $
-bin/zfec
-bin/zunfec
+@comment $NetBSD: PLIST,v 1.3 2020/06/29 15:55:52 adam Exp $
+bin/zfec-${PYVERSSUFFIX}
+bin/zunfec-${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}/not-zip-safe
 ${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/stdeb.cfg
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/zfec/__init__.py
 ${PYSITELIB}/zfec/__init__.pyc
@@ -37,8 +35,3 @@ ${PYSITELIB}/zfec/test/__init__.pyo
 ${PYSITELIB}/zfec/test/test_zfec.py
 ${PYSITELIB}/zfec/test/test_zfec.pyc
 ${PYSITELIB}/zfec/test/test_zfec.pyo
-share/doc/zfec/COPYING.GPL
-share/doc/zfec/COPYING.TGPPL.html
-share/doc/zfec/README.rst
-share/doc/zfec/TODO
-share/doc/zfec/changelog
diff --git a/converters/py-zfec/distinfo b/converters/py-zfec/distinfo
index 593ac49e53e..d374963b607 100644
--- a/converters/py-zfec/distinfo
+++ b/converters/py-zfec/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 01:43:53 agc Exp $
+$NetBSD: distinfo,v 1.6 2020/06/29 15:55:52 adam Exp $
 
-SHA1 (zfec-1.4.24.tar.gz) = 99b334431209332a14f0531de252aee3de18c948
-RMD160 (zfec-1.4.24.tar.gz) = 98d51af0c4af8d33f558e4e60f14773dc21fd178
-SHA512 (zfec-1.4.24.tar.gz) = ec213912eea054c954ddda67a401b1538fb2f02c2b56cdfb610df5f4852b79305ef72e9919c578d46a268ea4c5912a60422117326f633c7e9b8a7977561fa1f5
-Size (zfec-1.4.24.tar.gz) = 175884 bytes
-SHA1 (patch-aa) = 0df981871a8fb22656a53a1934c1153d1a65c442
+SHA1 (zfec-1.5.3.tar.gz) = 113df9685c667c844c8224121741f4a5386e9207
+RMD160 (zfec-1.5.3.tar.gz) = df7b9d7ad21f3d9c4fdb34dea0acb1fe00d90dd3
+SHA512 (zfec-1.5.3.tar.gz) = 1aee0740b370025cf5c24dca0decd9d87b83311d408198f97aa7b2361a2ebc1e5f1c34015ee72456144667842f20dcbc12e5f788c54942e4489d5e355c2706bd
+Size (zfec-1.5.3.tar.gz) = 79402 bytes
diff --git a/converters/py-zfec/patches/patch-aa b/converters/py-zfec/patches/patch-aa
deleted file mode 100644
index 5ca70d42272..00000000000
--- a/converters/py-zfec/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2012/02/12 19:55:09 gls Exp $
-
-http://tahoe-lafs.org/trac/zfec/ticket/11
-
---- setup.py.orig	2011-03-03 12:07:50.000000000 +0000
-+++ setup.py
-@@ -116,8 +116,8 @@ if 'darcsver' in sys.argv[1:]:
- # shipped in Ubuntu Lucid, so for now you have to manually install it
- # before building sdists or eggs:
- # http://bitbucket.org/tarek/distribute/issue/55/revision-control-plugin-automatically-installed-as-a-build-dependency-is-not-present-when-another-build-dependency-is-being
--if False:
--    setup_requires.append('setuptools_darcs >= 1.1.0')
-+#if False:
-+#    setup_requires.append('setuptools_darcs >= 1.1.0')
- 
- 
- # setuptools_trial is needed if you want "./setup.py trial" or