<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/14597f9bb47f3059e0aa29b15a48ab28f2cc7c07">https://github.com/macports/macports-ports/commit/14597f9bb47f3059e0aa29b15a48ab28f2cc7c07</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 14597f9bb47 asciidoc: Update to 10.1.1
</span>14597f9bb47 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 14597f9bb47f3059e0aa29b15a48ab28f2cc7c07
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Mon Jan 31 18:50:11 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> asciidoc: Update to 10.1.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> asciidoc is now a python module, so switch to the python portgroup to
</span><span style='display:block; white-space:pre;color:#404040;'> build it. Note that for a few other bits and pieces (docs and manpages,
</span><span style='display:block; white-space:pre;color:#404040;'> for example), we still need to invoke the old autoconf-based build
</span><span style='display:block; white-space:pre;color:#404040;'> system.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Switch to Python 3.10 as the new default python.
</span>---
textproc/asciidoc/Portfile | 53 ++++++++++++++++++++++++++++------------------
1 file changed, 32 insertions(+), 21 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/asciidoc/Portfile b/textproc/asciidoc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cd329c2832c..26a442ec0d2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/asciidoc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/asciidoc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,12 +3,13 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup python 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup asciidoc asciidoc-py3 9.1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 4fef2148ed93859afe13031e0c953bbe0dabba29 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 98941741bcef1b172bce735c9393255c095fe88642ac725a43a32afda0d73a4a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1131368
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup asciidoc asciidoc-py3 10.1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 422997f6e8997f8603561cb98ad6d3ee4010ba05 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e5024d8e92dbcc16214caa9b3fffab3cc80112c6af205b927170a0f6dda96e50 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1133017
</span> name asciidoc
categories textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,37 +29,47 @@ platforms darwin
</span> supported_archs noarch
installs_libs no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://asciidoc.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://asciidoc-py.github.io/
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Need autoconf to generate and install docs; python 1.0 PG disables configure, we can just re-enable it
</span> use_autoreconf yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:python39 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_configure yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 310
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.default_version \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 310
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-setuptools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:python${python.version} \
</span> port:libxml2 \
port:libxslt \
port:docbook-xml-4.5 \
port:docbook-xsl-nons
depends_run port:fop
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_test port:py${python.version}-pytest \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pytest-mock
</span> # Other runtime dependencies include dblatex, w3m and epubcheck, but those are
# rarely used and large. See #52758.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.python ${prefix}/bin/python3.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s:^\tpython3 :\t${configure.python} :" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s:#!/usr/bin/env python3:#!${configure.python}:" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/asciidoc.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/a2x.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|python3|${python.bin}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Makefile.in
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.target install docs vimdir=${prefix}/share/vim/vimfiles/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${prefix}/share/vim/vimfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "make manpages"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Avoid hidden dependency on gsed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append SED=/usr/bin/sed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "make docs DESTDIR='${destroot}'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${prefix}/share/man/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ doc/a2x.1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ doc/asciidoc.1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/man/man1
</span> }
test.run yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+test.cmd make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.target test
</span></pre><pre style='margin:0'>
</pre>