[pkgsrc/trunk]: pkgsrc/textproc/asciidoc asciidoc: revert upgrade

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8b3c08732bae
branches:  trunk
changeset: 372393:8b3c08732bae
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Jan 24 11:04:09 2022 +0000

description:
asciidoc: revert upgrade

The asciidoc script just returns exit code 1 whatever I pass it.
(the self tests worked)

diffstat:

 textproc/asciidoc/Makefile |   53 ++++++---
 textproc/asciidoc/PLIST    |  249 ++++++++++++++++++--------------------------
 textproc/asciidoc/distinfo |    8 +-
 3 files changed, 143 insertions(+), 167 deletions(-)

diffs (truncated from 353 to 300 lines):

diff -r 1835b7a3660b -r 8b3c08732bae textproc/asciidoc/Makefile
--- a/textproc/asciidoc/Makefile        Mon Jan 24 10:11:09 2022 +0000
+++ b/textproc/asciidoc/Makefile        Mon Jan 24 11:04:09 2022 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2022/01/24 09:58:21 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2022/01/24 11:04:09 wiz Exp $
 
-DISTNAME=      asciidoc-10.1.1
+DISTNAME=      asciidoc-9.1.1
+PKGREVISION=   1
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=asciidoc/}
 GITHUB_PROJECT=        asciidoc-py3
@@ -12,8 +13,6 @@
 
 DEPENDS+=      docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 DEPENDS+=      getopt-[0-9]*:../../misc/getopt
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-mock-[0-9]*:../../devel/py-test-mock
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 
 WRKSRC=                ${WRKDIR}/${DISTNAME:S/-/-py-/}
 
@@ -22,29 +21,49 @@
 SUBST_CLASSES+=                ad
 SUBST_STAGE.ad=                pre-configure
 SUBST_MESSAGE.ad=      Fixing hard-coded config file paths.
-SUBST_FILES.ad=                asciidoc/a2x.py asciidoc/asciidoc.py
+SUBST_FILES.ad=                a2x.py asciidoc.py
 SUBST_SED.ad=          -e 's,^\(CONF_DIR\).*=.*,\1="${PREFIX}/share/asciidoc",'
 
-REPLACE_PYTHON+=       asciidoc/a2x.py
-REPLACE_PYTHON+=       asciidoc/asciidoc.py
-REPLACE_PYTHON+=       asciidoc/resources/filters/code/code-filter.py
-REPLACE_PYTHON+=       asciidoc/resources/filters/latex/latex2img.py
-REPLACE_PYTHON+=       asciidoc/resources/filters/music/music2png.py
-REPLACE_PYTHON+=       asciidoc/resources/filters/graphviz/graphviz2png.py
-REPLACE_PYTHON+=       asciidoc/resources/filters/unwraplatex.py
+REPLACE_PYTHON+=       a2x.py
+REPLACE_PYTHON+=       asciidoc.py
+REPLACE_PYTHON+=       asciidocapi.py
+REPLACE_PYTHON+=       filters/code/code-filter.py
+REPLACE_PYTHON+=       filters/latex/latex2img.py
+REPLACE_PYTHON+=       filters/music/music2png.py
+REPLACE_PYTHON+=       filters/graphviz/graphviz2png.py
+REPLACE_PYTHON+=       filters/unwraplatex.py
 REPLACE_PYTHON+=       tests/testasciidoc.py
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+INSTALLATION_DIRS=     bin share/asciidoc share/asciidoc/filters \
+                       share/asciidoc/docbook-xsl share/asciidoc/stylesheets \
+                       share/asciidoc/javascripts \
+                       share/asciidoc/images/icons/callouts \
+                       ${PKGMANDIR}/man1 ${DOCDIR}
+
+DOCDIR=                        ${PREFIX}/share/doc/asciidoc
+
 .include "options.mk"
 
-# as of 10.1.1
-# 10 failed, 37 passed, 4 warnings
-TEST_ENV+=     PYTHONPATH=${WRKSRC}/build/lib
+do-build:
+       cd ${WRKSRC} && \
+               ${PYTHONBIN} a2x.py -f manpage doc/a2x.1.txt && \
+               ${PYTHONBIN} a2x.py -f manpage doc/asciidoc.1.txt
+
+do-install:
+       ${INSTALL_SCRIPT} ${WRKSRC}/asciidoc.py ${DESTDIR}${PREFIX}/bin/asciidoc
+       ${INSTALL_SCRIPT} ${WRKSRC}/a2x.py ${DESTDIR}${PREFIX}/bin/a2x
+       ${INSTALL_MAN} ${WRKSRC}/doc/asciidoc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
+       ${INSTALL_MAN} ${WRKSRC}/doc/a2x.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
+       ${INSTALL_DATA} ${WRKSRC}/doc/asciidoc.txt ${DESTDIR}${DOCDIR}
+       cd ${WRKSRC} && pax -wr -pma *.conf filters docbook-xsl/*.xsl \
+               stylesheets/*.css javascripts/*.js images/* dblatex/* themes/* \
+               ${DESTDIR}${PREFIX}/share/asciidoc/.
+
 do-test:
-       cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
+       cd ${WRKSRC} && ${PYTHONBIN} asciidoc.py -v doc/asciidoc.txt
 
 .include "../../lang/python/application.mk"
-.include "../../lang/python/egg.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 1835b7a3660b -r 8b3c08732bae textproc/asciidoc/PLIST
--- a/textproc/asciidoc/PLIST   Mon Jan 24 10:11:09 2022 +0000
+++ b/textproc/asciidoc/PLIST   Mon Jan 24 11:04:09 2022 +0000
@@ -1,148 +1,105 @@
-@comment $NetBSD: PLIST,v 1.21 2022/01/24 09:58:21 wiz Exp $
+@comment $NetBSD: PLIST,v 1.22 2022/01/24 11:04:09 wiz Exp $
 bin/a2x
 bin/asciidoc
-${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}/top_level.txt
-${PYSITELIB}/asciidoc/__init__.py
-${PYSITELIB}/asciidoc/__init__.pyc
-${PYSITELIB}/asciidoc/__init__.pyo
-${PYSITELIB}/asciidoc/__main__.py
-${PYSITELIB}/asciidoc/__main__.pyc
-${PYSITELIB}/asciidoc/__main__.pyo
-${PYSITELIB}/asciidoc/__metadata__.py
-${PYSITELIB}/asciidoc/__metadata__.pyc
-${PYSITELIB}/asciidoc/__metadata__.pyo
-${PYSITELIB}/asciidoc/a2x.py
-${PYSITELIB}/asciidoc/a2x.pyc
-${PYSITELIB}/asciidoc/a2x.pyo
-${PYSITELIB}/asciidoc/api.py
-${PYSITELIB}/asciidoc/api.pyc
-${PYSITELIB}/asciidoc/api.pyo
-${PYSITELIB}/asciidoc/asciidoc.py
-${PYSITELIB}/asciidoc/asciidoc.pyc
-${PYSITELIB}/asciidoc/asciidoc.pyo
-${PYSITELIB}/asciidoc/collections.py
-${PYSITELIB}/asciidoc/collections.pyc
-${PYSITELIB}/asciidoc/collections.pyo
-${PYSITELIB}/asciidoc/exceptions.py
-${PYSITELIB}/asciidoc/exceptions.pyc
-${PYSITELIB}/asciidoc/exceptions.pyo
-${PYSITELIB}/asciidoc/resources/asciidoc.conf
-${PYSITELIB}/asciidoc/resources/dblatex/asciidoc-dblatex.sty
-${PYSITELIB}/asciidoc/resources/dblatex/asciidoc-dblatex.xsl
-${PYSITELIB}/asciidoc/resources/dblatex/dblatex-readme.txt
-${PYSITELIB}/asciidoc/resources/docbook-xsl/asciidoc-docbook-xsl.txt
-${PYSITELIB}/asciidoc/resources/docbook-xsl/chunked.xsl
-${PYSITELIB}/asciidoc/resources/docbook-xsl/common.xsl
-${PYSITELIB}/asciidoc/resources/docbook-xsl/epub.xsl
-${PYSITELIB}/asciidoc/resources/docbook-xsl/fo.xsl
-${PYSITELIB}/asciidoc/resources/docbook-xsl/htmlhelp.xsl
-${PYSITELIB}/asciidoc/resources/docbook-xsl/manpage.xsl
-${PYSITELIB}/asciidoc/resources/docbook-xsl/text.xsl
-${PYSITELIB}/asciidoc/resources/docbook-xsl/xhtml.xsl
-${PYSITELIB}/asciidoc/resources/docbook45.conf
-${PYSITELIB}/asciidoc/resources/docbook5.conf
-${PYSITELIB}/asciidoc/resources/filters/code/code-filter-readme.txt
-${PYSITELIB}/asciidoc/resources/filters/code/code-filter-test.txt
-${PYSITELIB}/asciidoc/resources/filters/code/code-filter.conf
-${PYSITELIB}/asciidoc/resources/filters/code/code-filter.py
-${PYSITELIB}/asciidoc/resources/filters/code/code-filter.pyc
-${PYSITELIB}/asciidoc/resources/filters/code/code-filter.pyo
-${PYSITELIB}/asciidoc/resources/filters/graphviz/asciidoc-graphviz-sample.txt
-${PYSITELIB}/asciidoc/resources/filters/graphviz/graphviz-filter.conf
-${PYSITELIB}/asciidoc/resources/filters/graphviz/graphviz2png.py
-${PYSITELIB}/asciidoc/resources/filters/graphviz/graphviz2png.pyc
-${PYSITELIB}/asciidoc/resources/filters/graphviz/graphviz2png.pyo
-${PYSITELIB}/asciidoc/resources/filters/latex/latex-filter.conf
-${PYSITELIB}/asciidoc/resources/filters/latex/latex2img.py
-${PYSITELIB}/asciidoc/resources/filters/latex/latex2img.pyc
-${PYSITELIB}/asciidoc/resources/filters/latex/latex2img.pyo
-${PYSITELIB}/asciidoc/resources/filters/music/music-filter-test.txt
-${PYSITELIB}/asciidoc/resources/filters/music/music-filter.conf
-${PYSITELIB}/asciidoc/resources/filters/music/music2png.py
-${PYSITELIB}/asciidoc/resources/filters/music/music2png.pyc
-${PYSITELIB}/asciidoc/resources/filters/music/music2png.pyo
-${PYSITELIB}/asciidoc/resources/filters/source/source-highlight-filter-test.txt
-${PYSITELIB}/asciidoc/resources/filters/source/source-highlight-filter.conf
-${PYSITELIB}/asciidoc/resources/filters/unwraplatex.py
-${PYSITELIB}/asciidoc/resources/filters/unwraplatex.pyc
-${PYSITELIB}/asciidoc/resources/filters/unwraplatex.pyo
-${PYSITELIB}/asciidoc/resources/help.conf
-${PYSITELIB}/asciidoc/resources/html4.conf
-${PYSITELIB}/asciidoc/resources/html5.conf
-${PYSITELIB}/asciidoc/resources/icons/callouts/1.png
-${PYSITELIB}/asciidoc/resources/icons/callouts/10.png
-${PYSITELIB}/asciidoc/resources/icons/callouts/11.png
-${PYSITELIB}/asciidoc/resources/icons/callouts/12.png
-${PYSITELIB}/asciidoc/resources/icons/callouts/13.png
-${PYSITELIB}/asciidoc/resources/icons/callouts/14.png
-${PYSITELIB}/asciidoc/resources/icons/callouts/15.png
-${PYSITELIB}/asciidoc/resources/icons/callouts/2.png
-${PYSITELIB}/asciidoc/resources/icons/callouts/3.png
-${PYSITELIB}/asciidoc/resources/icons/callouts/4.png
-${PYSITELIB}/asciidoc/resources/icons/callouts/5.png
-${PYSITELIB}/asciidoc/resources/icons/callouts/6.png
-${PYSITELIB}/asciidoc/resources/icons/callouts/7.png
-${PYSITELIB}/asciidoc/resources/icons/callouts/8.png
-${PYSITELIB}/asciidoc/resources/icons/callouts/9.png
-${PYSITELIB}/asciidoc/resources/icons/caution.png
-${PYSITELIB}/asciidoc/resources/icons/example.png
-${PYSITELIB}/asciidoc/resources/icons/home.png
-${PYSITELIB}/asciidoc/resources/icons/important.png
-${PYSITELIB}/asciidoc/resources/icons/next.png
-${PYSITELIB}/asciidoc/resources/icons/note.png
-${PYSITELIB}/asciidoc/resources/icons/prev.png
-${PYSITELIB}/asciidoc/resources/icons/tip.png
-${PYSITELIB}/asciidoc/resources/icons/up.png
-${PYSITELIB}/asciidoc/resources/icons/warning.png
-${PYSITELIB}/asciidoc/resources/javascripts/ASCIIMathML.js
-${PYSITELIB}/asciidoc/resources/javascripts/LaTeXMathML.js
-${PYSITELIB}/asciidoc/resources/javascripts/asciidoc.js
-${PYSITELIB}/asciidoc/resources/javascripts/slidy.js
-${PYSITELIB}/asciidoc/resources/javascripts/toc.js
-${PYSITELIB}/asciidoc/resources/lang-ca.conf
-${PYSITELIB}/asciidoc/resources/lang-cs.conf
-${PYSITELIB}/asciidoc/resources/lang-de.conf
-${PYSITELIB}/asciidoc/resources/lang-el.conf
-${PYSITELIB}/asciidoc/resources/lang-en.conf
-${PYSITELIB}/asciidoc/resources/lang-es.conf
-${PYSITELIB}/asciidoc/resources/lang-fi.conf
-${PYSITELIB}/asciidoc/resources/lang-fr.conf
-${PYSITELIB}/asciidoc/resources/lang-hu.conf
-${PYSITELIB}/asciidoc/resources/lang-id.conf
-${PYSITELIB}/asciidoc/resources/lang-it.conf
-${PYSITELIB}/asciidoc/resources/lang-ja.conf
-${PYSITELIB}/asciidoc/resources/lang-nl.conf
-${PYSITELIB}/asciidoc/resources/lang-pl.conf
-${PYSITELIB}/asciidoc/resources/lang-pt-BR.conf
-${PYSITELIB}/asciidoc/resources/lang-ro.conf
-${PYSITELIB}/asciidoc/resources/lang-ru.conf
-${PYSITELIB}/asciidoc/resources/lang-sv.conf
-${PYSITELIB}/asciidoc/resources/lang-uk.conf
-${PYSITELIB}/asciidoc/resources/lang-zh-CN.conf
-${PYSITELIB}/asciidoc/resources/latex.conf
-${PYSITELIB}/asciidoc/resources/slidy.conf
-${PYSITELIB}/asciidoc/resources/stylesheets/asciidoc.css
-${PYSITELIB}/asciidoc/resources/stylesheets/docbook-xsl.css
-${PYSITELIB}/asciidoc/resources/stylesheets/pygments.css
-${PYSITELIB}/asciidoc/resources/stylesheets/slidy.css
-${PYSITELIB}/asciidoc/resources/stylesheets/toc2.css
-${PYSITELIB}/asciidoc/resources/stylesheets/xhtml11-quirks.css
-${PYSITELIB}/asciidoc/resources/text.conf
-${PYSITELIB}/asciidoc/resources/themes/flask/flask.css
-${PYSITELIB}/asciidoc/resources/themes/volnitsky/volnitsky.css
-${PYSITELIB}/asciidoc/resources/xhtml11-quirks.conf
-${PYSITELIB}/asciidoc/resources/xhtml11.conf
-${PYSITELIB}/asciidoc/utils.py
-${PYSITELIB}/asciidoc/utils.pyc
-${PYSITELIB}/asciidoc/utils.pyo
-@pkgdir share/doc/asciidoc
-@pkgdir share/asciidoc/stylesheets
-@pkgdir share/asciidoc/javascripts
-@pkgdir share/asciidoc/images/icons/callouts
-@pkgdir share/asciidoc/filters
-@pkgdir share/asciidoc/docbook-xsl
-@pkgdir man/man1
+man/man1/a2x.1
+man/man1/asciidoc.1
+share/asciidoc/asciidoc.conf
+share/asciidoc/dblatex/asciidoc-dblatex.sty
+share/asciidoc/dblatex/asciidoc-dblatex.xsl
+share/asciidoc/dblatex/dblatex-readme.txt
+share/asciidoc/docbook-xsl/chunked.xsl
+share/asciidoc/docbook-xsl/common.xsl
+share/asciidoc/docbook-xsl/epub.xsl
+share/asciidoc/docbook-xsl/fo.xsl
+share/asciidoc/docbook-xsl/htmlhelp.xsl
+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
+share/asciidoc/filters/code/code-filter.py
+share/asciidoc/filters/graphviz/asciidoc-graphviz-sample.txt
+share/asciidoc/filters/graphviz/graphviz-filter.conf
+share/asciidoc/filters/graphviz/graphviz2png.py
+share/asciidoc/filters/latex/latex-filter.conf
+share/asciidoc/filters/latex/latex2img.py
+share/asciidoc/filters/music/music-filter-test.txt
+share/asciidoc/filters/music/music-filter.conf
+share/asciidoc/filters/music/music2png.py
+share/asciidoc/filters/source/source-highlight-filter-test.txt
+share/asciidoc/filters/source/source-highlight-filter.conf
+share/asciidoc/filters/unwraplatex.py
+share/asciidoc/help.conf
+share/asciidoc/html4.conf
+share/asciidoc/html5.conf
+share/asciidoc/images/highlighter.png
+share/asciidoc/images/icons/README
+share/asciidoc/images/icons/callouts/1.png
+share/asciidoc/images/icons/callouts/10.png
+share/asciidoc/images/icons/callouts/11.png
+share/asciidoc/images/icons/callouts/12.png
+share/asciidoc/images/icons/callouts/13.png
+share/asciidoc/images/icons/callouts/14.png
+share/asciidoc/images/icons/callouts/15.png
+share/asciidoc/images/icons/callouts/2.png
+share/asciidoc/images/icons/callouts/3.png
+share/asciidoc/images/icons/callouts/4.png
+share/asciidoc/images/icons/callouts/5.png
+share/asciidoc/images/icons/callouts/6.png
+share/asciidoc/images/icons/callouts/7.png
+share/asciidoc/images/icons/callouts/8.png
+share/asciidoc/images/icons/callouts/9.png
+share/asciidoc/images/icons/caution.png
+share/asciidoc/images/icons/example.png
+share/asciidoc/images/icons/home.png
+share/asciidoc/images/icons/important.png
+share/asciidoc/images/icons/next.png
+share/asciidoc/images/icons/note.png
+share/asciidoc/images/icons/prev.png
+share/asciidoc/images/icons/tip.png
+share/asciidoc/images/icons/up.png
+share/asciidoc/images/icons/warning.png
+share/asciidoc/images/smallnew.png