<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/9230324e4b2d6596870129656c34dc4764ef3e3e">https://github.com/macports/macports-ports/commit/9230324e4b2d6596870129656c34dc4764ef3e3e</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 9230324 docbook-xsl: Use the non-namespaced version
</span>9230324 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9230324e4b2d6596870129656c34dc4764ef3e3e
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Apr 25 13:20:44 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> docbook-xsl: Use the non-namespaced version
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes rendering of manpages by xsltproc.
</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/56354
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> When the port was updated to 1.79.2 in 04e6959f23bb6b1bd40f40f4d1a3ee2fb43e0714,
</span><span style='display:block; white-space:pre;color:#404040;'> it was inadvertently updated to the namespaced version, because upstream
</span><span style='display:block; white-space:pre;color:#404040;'> changed the default packaging from non-namespaced to namespaced.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The namespaced version can be found in the separate docbook-xsl-ns port,
</span><span style='display:block; white-space:pre;color:#404040;'> which still needs to be updated to the latest version, and ideally
</span><span style='display:block; white-space:pre;color:#404040;'> merged into the docbook-xsl port as a subport. Renaming the ports and
</span><span style='display:block; white-space:pre;color:#404040;'> updating the dependents might also still be considered.
</span>---
textproc/docbook-xsl/Portfile | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/docbook-xsl/Portfile b/textproc/docbook-xsl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7f86fec..b997aee 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/docbook-xsl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/docbook-xsl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup xmlcatalog 1.0
</span>
github.setup docbook xslt10-stylesheets 1.79.2 release/
name docbook-xsl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories textproc
platforms darwin
license MIT Permissive
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,16 +21,18 @@ github.tarball_from \
</span>
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${name}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${name}-nons-${version}
</span> distfiles-append \
${name}-doc-${version}${extract.suffix}
checksums ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 425ca8723443bcd45c23d33df26e13b930b2ce42 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 316524ea444e53208a2fb90eeb676af755da96e1417835ba5f5eb719c81fa371 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 63bae43e79c3b8bc3dac66711eb8c9e5ae3e4a32 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ee8b9eca0b7a8f89075832a2da7534bce8c5478fc8fc2676f512d5d87d832102 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 23400667 \
</span> ${name}-doc-${version}${extract.suffix} \
rmd160 f0937514b2eaff60cdeca60b7dc1e86b07bf1e09 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9bc38a3015717279a3a0620efb2d4bcace430077241ae2b0da609ba67d8340bc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9bc38a3015717279a3a0620efb2d4bcace430077241ae2b0da609ba67d8340bc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 534208
</span>
supported_archs noarch
use_configure no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +43,7 @@ set srcxslpaths "assembly catalog.xml common eclipse epub epub3 extensions fo \
</span> xhtml xhtml-1_1 xhtml5 \
VERSION VERSION.xsl"
set srcdocpaths "AUTHORS BUGS README RELEASE-NOTES.html RELEASE-NOTES.txt \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- TODO VERSION NEWS COPYING doc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TODO VERSION NEWS COPYING"
</span> set instxsldir "share/xsl/${name}"
set instdocdir "share/doc/${name}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,6 +60,7 @@ destroot {
</span> foreach pathname ${srcdocpaths} {
copy ${worksrcpath}/${pathname} ${destroot}${prefix}/${instdocdir}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${workpath}/${name}-${version}/doc ${destroot}${prefix}/${instdocdir}
</span>
# Also register docbook.sourceforge.net URIs for backward compatibility
copy ${destroot}${prefix}/${instxsldir}/catalog.xml ${destroot}${prefix}/${instxsldir}/catalog.sf.xml
</pre><pre style='margin:0'>
</pre>