Update to 0.42a. From the changelog:

- Add compatibility to Python 3 (and retain Python 2)
    - Remove python<3.0 restriction in setup.py
    - Make compatible to BeautifulSoup4
    - Accept octal representations of Python 2 (0nnn) and Python 3 (0onnn)
    - Prevent iterator being changed while iterating
    - Python 2/3 compatible treatment of max(n, None)
    - Prevent "Exception ... ignored" in `redo-log ... | head`
    - Distinguish byte (python2 str type) and unicode strings (python 3 str type)
    - Set file descriptor as inheritable for all pythons >=3.4
    - Unify print function usage for Python 2 and 3 via __future__ import
    - Run 2to3 utility
    - Remove python interpreter selection
- GettingStarted.md: Add -E option to sudo to preserve environment
- docs/cookbook/c: missing quote char.

4 files changed, 50 insertions, 10 deletions

diff --git a/devel/apenwarr-redo/Makefile b/devel/apenwarr-redo/Makefile
index 300926d68f2..3d40bd6dc9d 100644
--- a/devel/apenwarr-redo/Makefile
+++ b/devel/apenwarr-redo/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2019/11/09 15:00:55 schmonz Exp $
+# $NetBSD: Makefile,v 1.3 2020/03/30 08:02:22 schmonz Exp $
 
-DISTNAME=	redo-0.42
+DISTNAME=	redo-0.42a
 PKGNAME=	apenwarr-${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	-https://codeload.github.com/apenwarr/redo/tar.gz/${DISTNAME}
@@ -12,9 +12,7 @@ LICENSE=	apache-2.0
 
 CONFLICTS+=	jdebp-redo-[0-9]*
 
-PYTHON_VERSIONS_ACCEPTED=	27
-
-BUILD_DEPENDS+=	${PYPKGPREFIX}-beautifulsoup-[0-9]*:../../www/py-beautifulsoup
+BUILD_DEPENDS+=	${PYPKGPREFIX}-beautifulsoup4-[0-9]*:../../www/py-beautifulsoup4
 BUILD_DEPENDS+=	${PYPKGPREFIX}-markdown-[0-9]*:../../textproc/py-markdown
 
 DEPENDS+=	dash-[0-9]*:../../shells/dash
@@ -23,7 +21,13 @@ DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 
 WRKSRC=		${WRKDIR}/redo-${DISTNAME}
 
+SUBST_CLASSES+=		paths
+SUBST_STAGE.paths=	do-configure
+SUBST_FILES.paths=	redo/whichpython.do
+SUBST_VARS.paths=	PYTHONBIN
+
 INSTALL_ENV+=	MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
 
 .include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/apenwarr-redo/distinfo b/devel/apenwarr-redo/distinfo
index f722cee6f4f..b5dccadb0b0 100644
--- a/devel/apenwarr-redo/distinfo
+++ b/devel/apenwarr-redo/distinfo
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.4 2019/11/09 15:00:55 schmonz Exp $
+$NetBSD: distinfo,v 1.5 2020/03/30 08:02:22 schmonz Exp $
 
-SHA1 (redo-0.42.tar.gz) = 86ccb48dd5356b6b2a595b270ca6ab845c9e51d1
-RMD160 (redo-0.42.tar.gz) = 176deeb21453759b315fc584c51078c8b26821d9
-SHA512 (redo-0.42.tar.gz) = 41b8417136f98d12edf3c62f027f2459ae3fb92f6c5464553d79c3a52344de57220a5c64b565118da0a99c1544eaa153a468ffcdcfbf7193c76c896bcd40e900
-Size (redo-0.42.tar.gz) = 194344 bytes
+SHA1 (redo-0.42a.tar.gz) = 5720e2fa9d7fc5bd1d36fcb9477c771f5fe1c229
+RMD160 (redo-0.42a.tar.gz) = 4c7fdfee85b036b827e33a04837fb49127d168a8
+SHA512 (redo-0.42a.tar.gz) = 8473bd8168c8e70b59a573560f8f725c8538061ee15eabeb63e467a363fa6869aa8088e8ce324726da4e2f7115e2ddf72cbb657703e9090f4f93c05f42bb67cb
+Size (redo-0.42a.tar.gz) = 195053 bytes
 SHA1 (patch-bin_all.do) = 761d24a832fa8067b6123fc02918460f579ffb5a
 SHA1 (patch-do) = 75b461b94d83f6145d161355aec59633bcad2c20
+SHA1 (patch-docs_md2man.py) = 7b2c08665a9777f713c584025b91e2b95c349eb9
 SHA1 (patch-redo_sh.do) = d6223596c83744d19f23d0026a321fc89102569d
+SHA1 (patch-redo_whichpython.do) = aadf1ccc48743980abc40840121a423bb07eb9dc
 SHA1 (patch-t_shelltest.od) = ca86299da6ae30b44a0e10cfe1a6ef30299dd0bc
diff --git a/devel/apenwarr-redo/patches/patch-docs_md2man.py b/devel/apenwarr-redo/patches/patch-docs_md2man.py
new file mode 100644
index 00000000000..47f4e776bb9
--- /dev/null
+++ b/devel/apenwarr-redo/patches/patch-docs_md2man.py
@@ -0,0 +1,20 @@
+$NetBSD: patch-docs_md2man.py,v 1.1 2020/03/30 08:02:22 schmonz Exp $
+
+Avoid finding older BeautifulSoup.
+
+--- docs/md2man.py.orig	2020-03-04 20:00:34.000000000 +0000
++++ docs/md2man.py
+@@ -1,11 +1,7 @@
+ from __future__ import print_function
+ import sys, os, markdown, re
+-try:
+-    from BeautifulSoup import BeautifulSoup
+-    bsver = 3
+-except ModuleNotFoundError:
+-    from bs4 import BeautifulSoup
+-    bsver = 4
++from bs4 import BeautifulSoup
++bsver = 4
+ 
+ def _split_lines(s):
+     return re.findall(r'([^\n]*\n?)', s)
diff --git a/devel/apenwarr-redo/patches/patch-redo_whichpython.do b/devel/apenwarr-redo/patches/patch-redo_whichpython.do
new file mode 100644
index 00000000000..655b823a771
--- /dev/null
+++ b/devel/apenwarr-redo/patches/patch-redo_whichpython.do
@@ -0,0 +1,14 @@
+$NetBSD: patch-redo_whichpython.do,v 1.1 2020/03/30 08:02:22 schmonz Exp $
+
+Avoid finding pkg_alternatives(8) wrapper, or really any interpreter
+besides the one explicitly depended on.
+
+--- redo/whichpython.do.orig	2020-03-04 20:00:34.000000000 +0000
++++ redo/whichpython.do
+@@ -1,5 +1,5 @@
+ exec >&2
+-for py in intentionally-missing python python3 python2 python2.7; do
++for py in intentionally-missing @PYTHONBIN@; do
+ 	echo "Trying: $py"
+ 	cmd=$(command -v "$py" || true)
+ 	out=$($cmd -c 'print("success")' 2>/dev/null) || true