<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/88eec27634095ce19cdd1e8fd7ea8825ab0ab4e6">https://github.com/macports/macports-base/commit/88eec27634095ce19cdd1e8fd7ea8825ab0ab4e6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 88eec27634095ce19cdd1e8fd7ea8825ab0ab4e6
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu May 3 03:05:37 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> docbook-xsl has been renamed to docbook-xsl-nons
</span>---
doc/Makefile.in | 6 +++---
portmgr/ReleaseProcess.md | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/doc/Makefile.in b/doc/Makefile.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 1fd9d9a..ec04d6c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/doc/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/doc/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ XSLTPROC=
</span> else
ASCIIDOC= $(wildcard ${prefix}/bin/asciidoc)
XSLTPROC= $(wildcard ${prefix}/bin/xsltproc)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-DOCBOOK_XSL= $(wildcard ${prefix}/share/xsl/docbook-xsl/manpages/docbook.xsl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+DOCBOOK_XSL= $(wildcard ${prefix}/share/xsl/docbook-xsl-nons/manpages/docbook.xsl)
</span> endif
ASCIIDOCFLAGS= -f asciidoc.conf -a manversion=${MACPORTS_VERSION} -a revdate=${MACPORTS_VERSION}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -171,12 +171,12 @@ ifneq ($(and $(ASCIIDOC),$(XSLTPROC),$(DOCBOOK_XSL)),)
</span> else
man: ${MAN} ${MAN:%=%.gz}
@echo "* Warning: Using pre-generated man pages only."
<span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo "* asciidoc, xsltproc (port libxslt) and docbook-xsl are required to generate man pages from source."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo "* asciidoc, xsltproc (port libxslt) and docbook-xsl-nons are required to generate man pages from source."
</span>
%.xml %.html: | %.txt
@echo "* In order to modify and generate output from these source files,"
@echo "* please install the required tools into ${prefix} with"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo "* sudo ${prefix}/bin/port install asciidoc libxslt docbook-xsl"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo "* sudo ${prefix}/bin/port install asciidoc libxslt docbook-xsl-nons"
</span> @echo "* or as an alternative, specify external paths for the tools"
@echo "* make ASCIIDOC=.../bin/asciidoc XSLTPROC=../bin/xsltproc DOCBOOK_XSL=installed"
@exit 1
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/portmgr/ReleaseProcess.md b/portmgr/ReleaseProcess.md
</span><span style='display:block; white-space:pre;color:#808080;'>index db0de8e..ba7c249 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/portmgr/ReleaseProcess.md
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/portmgr/ReleaseProcess.md
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,7 +86,7 @@ code:
</span> make -C doc/ clean all \
ASCIIDOC=/opt/local/bin/asciidoc \
XSLTPROC=/opt/local/bin/xsltproc \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- DOCBOOK_XSL=/opt/local/share/xsl/docbook-xsl/manpages/docbook.xsl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DOCBOOK_XSL=/opt/local/share/xsl/docbook-xsl-nons/manpages/docbook.xsl
</span>
* Make sure that these and any other changes or bug fixes are made on and/or
merged between the release branch and master as needed. For instance, if
</pre><pre style='margin:0'>
</pre>