<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/abccbbb95ed65603d2e846149c92d955a5b2b975">https://github.com/macports/macports-ports/commit/abccbbb95ed65603d2e846149c92d955a5b2b975</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 abccbbb95ed asciidoc: Fix documentation install directory
</span>abccbbb95ed is described below
<span style='display:block; white-space:pre;color:#808000;'>commit abccbbb95ed65603d2e846149c92d955a5b2b975
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Sat Mar 11 12:07:20 2023 +0100
<span style='display:block; white-space:pre;color:#404040;'> asciidoc: Fix documentation install directory
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The default for docdir is ${datarootdir}/doc/${PACKAGE_TARNAME}, and
</span><span style='display:block; white-space:pre;color:#404040;'> while these have the values we expect them to have in the configure
</span><span style='display:block; white-space:pre;color:#404040;'> script, this variable is left unexpanded and ${PACKAGE_TARNAME} is not
</span><span style='display:block; white-space:pre;color:#404040;'> defined in the Makefile after Makefile generation, ends up empty, and
</span><span style='display:block; white-space:pre;color:#404040;'> the documentation is installed in ${datarootdir}/doc. This is clearly
</span><span style='display:block; white-space:pre;color:#404040;'> a bug, but I'm not sure whether it is in autoconf or asciidoc.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/67081
</span>---
textproc/asciidoc/Portfile | 11 +++++++++--
1 file changed, 9 insertions(+), 2 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 a1c6165809e..33ebdc7b18c 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;'>@@ -6,7 +6,7 @@ PortGroup github 1.0
</span> PortGroup python 1.0
github.setup asciidoc asciidoc-py3 10.2.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> checksums rmd160 e6369eddc6d72a4ea910f06f320881be105cd348 \
sha256 f830cb726d0b1448a451e916a7e60abfd27fce7f4dbce4c0c8f1ff856c1765ee \
size 1199960
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,6 +34,13 @@ homepage https://asciidoc-py.github.io/
</span> # Need autoconf to generate and install docs; python 1.0 PG disables configure, we can just re-enable it
use_autoreconf yes
use_configure yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# The default for docdir is ${datarootdir}/doc/${PACKAGE_TARNAME}, and while
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# these have the values we expect them to have in the configure script, this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# variable is left unexpanded and ${PACKAGE_TARNAME} is not defined in the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Makefile after Makefile generation, ends up empty, and the documentation is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# installed in ${datarootdir}/doc. This is clearly a bug, but I'm not sure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# whether it is in autoconf or asciidoc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --docdir=${prefix}/share/doc/${name}
</span>
python.versions 311
python.default_version \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,7 +69,7 @@ post-build {
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "make docs DESTDIR='${destroot}${prefix}'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "make docs DESTDIR='${destroot}'"
</span> xinstall -d -m 0755 ${destroot}${prefix}/share/man/man1
xinstall -m 0644 -W ${worksrcpath} \
doc/a2x.1 \
</pre><pre style='margin:0'>
</pre>