<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b2dad106386c8e1b972d91be9c823cded0cba167">https://github.com/macports/macports-ports/commit/b2dad106386c8e1b972d91be9c823cded0cba167</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 b2dad106386 libxslt: Revert 165a2a9
</span>b2dad106386 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b2dad106386c8e1b972d91be9c823cded0cba167
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Dec 9 01:14:40 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> libxslt: Revert 165a2a9
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This still doesn't work on the buildbot for some reason.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/61779
</span>---
textproc/libxslt/Portfile | 8 +-------
textproc/libxslt/files/xsltproc.xml.patch | 18 ++----------------
2 files changed, 3 insertions(+), 23 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/libxslt/Portfile b/textproc/libxslt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ba7481fb566..3311e5c7bf5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/libxslt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/libxslt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +34,7 @@ configure.args --without-python \
</span> --disable-silent-rules
if {${name} eq ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</span>
depends_build port:pkgconfig
depends_lib-append port:icu \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,13 +44,7 @@ if {${name} eq ${subport}} {
</span>
# Temporary patch to fix xsltproc.1 manpage; remove with next version.
depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:docbook-xml \
</span> port:docbook-xsl-nons
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Delete the corrupt manpage to ensure that the build fails if
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # we can't regenerate it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${worksrcpath}/doc/xsltproc.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> patchfiles-append xsltproc.xml.patch
pre-configure {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/libxslt/files/xsltproc.xml.patch b/textproc/libxslt/files/xsltproc.xml.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 109e36caba6..0003ce0cbe9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/libxslt/files/xsltproc.xml.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/libxslt/files/xsltproc.xml.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,27 +1,13 @@
</span> Fix the formatting of the xsltproc.1 manpage.
https://gitlab.gnome.org/GNOME/libxslt/-/issues/31
<span style='display:block; white-space:pre;background:#ffe0e0;'>-https://git.archlinux.org/svntogit/packages.git/tree/trunk/0002-Fix-manpage.patch?h=packages/libxslt&id=2036f1e3592a578dff22783834ba1678ae3bc193
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- doc/Makefile.in.orig 2019-10-30 15:02:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/Makefile.in 2020-12-09 00:57:41.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -823,9 +823,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ($(XSLTPROC) -o ../libxslt/libxslt.syms $(srcdir)/syms.xsl $(srcdir)/symbols.xml)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xsltproc.1: $(srcdir)/xsltproc.xml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -@(if [ -x $(XSLTPROC) ] ; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -@(if [ -x $(srcdir)/../xsltproc/xsltproc ] ; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Rebuilding the man pages from the xml" ; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(XSLTPROC) --nonet $(srcdir)/xsltproc.xml ; fi)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(srcdir)/../xsltproc/xsltproc --nonet $(srcdir)/xsltproc.xml ; fi)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note that in the following, xmllint output is piped to xsltproc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- search.php: $(srcdir)/api.xsl $(srcdir)/site.xsl $(srcdir)/search.templ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.gnome.org/GNOME/libxslt/-/commit/f165525fe744e6fe3b377b480d6cc5f9c546d360
</span> --- doc/xsltproc.xml.orig 2019-10-30 15:02:14.000000000 -0500
+++ doc/xsltproc.xml 2020-12-09 00:20:46.000000000 -0600
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl"
- href="http://cdn.docbook.org/release/xsl/current//manpages/docbook.xsl"?>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ href="http://cdn.docbook.org/release/xsl-nons/current/manpages/docbook.xsl"?>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ href="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"?>
</span> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
</pre><pre style='margin:0'>
</pre>