asciidoc: switch to the py3 port of asciidoc, update to 9.0.0rc2.

This is technically a release candidate but it has been tested in a limited
pbulk build and it lets us get rid of another python2 dependency.

4 files changed, 49 insertions, 10 deletions

diff --git a/textproc/asciidoc/Makefile b/textproc/asciidoc/Makefile
index a2170373023..daad816ce8d 100644
--- a/textproc/asciidoc/Makefile
+++ b/textproc/asciidoc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2019/04/25 07:33:23 maya Exp $
+# $NetBSD: Makefile,v 1.48 2020/05/03 12:03:51 tnn Exp $
 
-DISTNAME=	asciidoc-8.6.10
-PKGREVISION=	1
+DISTNAME=	asciidoc-py3-9.0.0rc2
+PKGNAME=	${DISTNAME:S/-py3//}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=asciidoc/}
 
@@ -32,7 +32,7 @@ REPLACE_PYTHON+=	filters/unwraplatex.py
 REPLACE_PYTHON+=	tests/asciidocapi.py
 REPLACE_PYTHON+=	tests/testasciidoc.py
 
-PYTHON_VERSIONS_ACCEPTED=	27
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 INSTALLATION_DIRS=	bin share/asciidoc share/asciidoc/filters \
 			share/asciidoc/docbook-xsl share/asciidoc/stylesheets \
diff --git a/textproc/asciidoc/PLIST b/textproc/asciidoc/PLIST
index e5e11f7fd25..c6c9d95c72a 100644
--- a/textproc/asciidoc/PLIST
+++ b/textproc/asciidoc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2018/07/03 03:48:38 adam Exp $
+@comment $NetBSD: PLIST,v 1.19 2020/05/03 12:03:51 tnn Exp $
 bin/a2x
 bin/asciidoc
 man/man1/a2x.1
@@ -16,6 +16,7 @@ share/asciidoc/docbook-xsl/manpage.xsl
 share/asciidoc/docbook-xsl/text.xsl
 share/asciidoc/docbook-xsl/xhtml.xsl
 share/asciidoc/docbook45.conf
+share/asciidoc/docbook5.conf
 share/asciidoc/filters/code/code-filter-readme.txt
 share/asciidoc/filters/code/code-filter-test.txt
 share/asciidoc/filters/code/code-filter.conf
@@ -68,6 +69,7 @@ share/asciidoc/javascripts/LaTeXMathML.js
 share/asciidoc/javascripts/asciidoc.js
 share/asciidoc/javascripts/slidy.js
 share/asciidoc/javascripts/toc.js
+share/asciidoc/lang-ca.conf
 share/asciidoc/lang-cs.conf
 share/asciidoc/lang-de.conf
 share/asciidoc/lang-el.conf
@@ -86,6 +88,7 @@ share/asciidoc/lang-ro.conf
 share/asciidoc/lang-ru.conf
 share/asciidoc/lang-sv.conf
 share/asciidoc/lang-uk.conf
+share/asciidoc/lang-zh-CN.conf
 share/asciidoc/latex.conf
 share/asciidoc/slidy.conf
 share/asciidoc/stylesheets/asciidoc.css
diff --git a/textproc/asciidoc/distinfo b/textproc/asciidoc/distinfo
index 7c5616b868b..481fd10a0f8 100644
--- a/textproc/asciidoc/distinfo
+++ b/textproc/asciidoc/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.19 2018/07/03 03:48:38 adam Exp $
+$NetBSD: distinfo,v 1.20 2020/05/03 12:03:51 tnn Exp $
 
-SHA1 (asciidoc-8.6.10.tar.gz) = 53b9c916bb4e29d2a4b850446be070ef81dcd792
-RMD160 (asciidoc-8.6.10.tar.gz) = 42346e7f17f136c0e7c5abb61216ef570aaa2dd9
-SHA512 (asciidoc-8.6.10.tar.gz) = 6ecc86977baaf1c756691e3f661e43ef2bb24e606898f6075bfa6f174d1fdc5e77d00853ffe014847e295364349d6ad34f3b8209cb97870e0233012fc38a281a
-Size (asciidoc-8.6.10.tar.gz) = 577208 bytes
+SHA1 (asciidoc-py3-9.0.0rc2.tar.gz) = 4e241ba6fc84a78fd07cceec120daf14cbbc3b7c
+RMD160 (asciidoc-py3-9.0.0rc2.tar.gz) = 9a4c31acadafd92d360697e2462981ee62c07684
+SHA512 (asciidoc-py3-9.0.0rc2.tar.gz) = 61ea1eb74a2e2da76f92e32ef279f8940fa4ea77a82078e15b54c7c6f134e9d177b0425c6eb8a239cfd2dc6a6f85ad5e93883a447a3e0e92850c0898747b5ea3
+Size (asciidoc-py3-9.0.0rc2.tar.gz) = 1145229 bytes
+SHA1 (patch-a2x.py) = 34e7c7c44b9a9a9e416e617ec03692a2b64f63f6
diff --git a/textproc/asciidoc/patches/patch-a2x.py b/textproc/asciidoc/patches/patch-a2x.py
new file mode 100644
index 00000000000..04840690333
--- /dev/null
+++ b/textproc/asciidoc/patches/patch-a2x.py
@@ -0,0 +1,35 @@
+$NetBSD: patch-a2x.py,v 1.1 2020/05/03 12:03:51 tnn Exp $
+
+From 665d86fa0003584b6a62da66be56309e59333d79 Mon Sep 17 00:00:00 2001
+From: Christopher Kent Hoadley <chris.hoadley@gmail.com>
+Date: Wed, 29 Apr 2020 20:12:01 -0500
+Subject: [PATCH] Fix a2x option collection from input file with non-ascii
+ encoding (#104)
+
+* Fix a2x Option Collection From Input File With Non-ASCII Encoding
+
+--- a2x.py.orig	2020-03-12 00:31:53.000000000 +0000
++++ a2x.py
+@@ -364,11 +364,19 @@ def get_source_options(asciidoc_file):
+     result = []
+     if os.path.isfile(asciidoc_file):
+         options = ''
+-        with open(asciidoc_file) as f:
++        with open(asciidoc_file, 'rb') as f:
++            line_number = 0
+             for line in f:
+-                mo = re.search(r'^//\s*a2x:', line)
++                line_number += 1
++                mo = re.search(b'^//\s*a2x:', line)
+                 if mo:
+-                    options += ' ' + line[mo.end():].strip()
++                    try:
++                        options += ' ' + line[mo.end():].strip().decode('ascii')
++                    except UnicodeDecodeError as e:
++                        warning(
++                            "Could not decode option to %s " % e.encoding +
++                            "on line %s in %s" % (line_number, asciidoc_file)
++                        )
+         parse_options()
+     return result
+