<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/9875cffcfdb567e35e6a8d38608d46c73e6d3f91">https://github.com/macports/macports-ports/commit/9875cffcfdb567e35e6a8d38608d46c73e6d3f91</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 9875cff asciidoc: Update to asciidoc-py3 9.0.0rc1
</span>9875cff is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9875cffcfdb567e35e6a8d38608d46c73e6d3f91
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Thu Feb 13 22:30:04 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> asciidoc: Update to asciidoc-py3 9.0.0rc1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Switch to a version that supports python 3.x, use python 3.7, set
</span><span style='display:block; white-space:pre;color:#404040;'> license_noconflict openssl because asciidoc doesn't use openssl, it just
</span><span style='display:block; white-space:pre;color:#404040;'> uses python, which links against openssl.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Since this is a source distribution now, we need to run autoreconf.
</span><span style='display:block; white-space:pre;color:#404040;'> Additionally, the libxml2, libxslt, docbook-xml-4.5 and docbook-xsl-nons
</span><span style='display:block; white-space:pre;color:#404040;'> dependencies are now also required at build time. Add them as library
</span><span style='display:block; white-space:pre;color:#404040;'> dependencies to ensure asciidoc works when compiling manpages, because
</span><span style='display:block; white-space:pre;color:#404040;'> that might require files from docbook-xsl-nons.
</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/59778
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/53943
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/59758
</span>---
textproc/asciidoc/Portfile | 40 ++++++++++++++++++++++++----------------
1 file changed, 24 insertions(+), 16 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 20cf696..70026f7 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;'>@@ -2,11 +2,13 @@
</span>
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup asciidoc asciidoc-py3 9.0.0rc1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4748713386dcc24c2189af772f9fda2fb453cdb6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 20d8f3582a1a404003d57d9f6173e6ce1802d0993684e2cd14a4bc4b2cead292 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1143948
</span> name asciidoc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 8.6.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha256 78db9d0567c8ab6570a6eff7ffdf84eadd91f2dfc0a92a2d0105d323cab4e1f0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 f19936593e3bed2755d77d38dd78a4769f77c7fa
</span>
categories textproc
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,18 +27,30 @@ platforms darwin
</span> supported_archs noarch
installs_libs no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# asciidoc doesn't use openssl, it just uses the python interpreter, which does.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license_noconflict openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> homepage http://asciidoc.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:python27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run port:docbook-xml-4.5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fop \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:python37 \
</span> port:libxml2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libxslt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxslt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:docbook-xml-4.5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:docbook-xsl-nons
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run port:fop
</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/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.python ${prefix}/bin/python3.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s:^\tpython3 :\t${configure.python} :" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s:#!/usr/bin/env python3:#!${configure.python}:" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/asciidoc.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/a2x.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot.target install docs vimdir=${prefix}/share/vim/vimfiles/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,12 +58,6 @@ pre-destroot {
</span> xinstall -d ${destroot}${prefix}/share/vim/vimfiles
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s:#!/usr/bin/env python:#!${prefix}/bin/python2.7:" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/bin/asciidoc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/bin/a2x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> platform darwin {
# Avoid hidden dependency on gsed
configure.env-append SED=/usr/bin/sed
</pre><pre style='margin:0'>
</pre>