<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/9f0fc5cf043014919edcce9a2c174518d5b104f1">https://github.com/macports/macports-ports/commit/9f0fc5cf043014919edcce9a2c174518d5b104f1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9f0fc5cf043014919edcce9a2c174518d5b104f1
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Apr 25 22:06:44 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> docbook-xsl: Rename to docbook-xsl-nons to match upstream
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Change docbook-xsl-ns from a standalone port to a subport, thus updating
</span><span style='display:block; white-space:pre;color:#404040;'> it to 1.79.2 and incorporating years of changes from docbook-xsl.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Move documentation to separate docbook-xsl-docs port.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Take over as maintainer.
</span>---
textproc/docbook-xsl-ns/Portfile | 54 ---------------------------
textproc/docbook-xsl/Portfile | 79 ++++++++++++++++++++++++++++------------
2 files changed, 55 insertions(+), 78 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/docbook-xsl-ns/Portfile b/textproc/docbook-xsl-ns/Portfile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bd6465e..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/docbook-xsl-ns/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,54 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup xmlcatalog 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name docbook-xsl-ns
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.76.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories textproc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license MIT Permissive
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description DocBook XSL NS (namespaced) Stylesheets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- This package contains a release of XSL stylesheets for \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- processing namespaced DocBook documents (DocBook 5 or \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- later). The stylesheets are the same as the concurrent \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- stylesheet release except that the templates match on \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elements in the DocBook namespace.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs noarch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/docbook/${name}/${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://docbook.sourceforge.net/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_zip yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 38a3361334ac3d135a851bcfa77beb0e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 8d2fa4a376f2caa018f668831279eacd03b4568e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 c05c6e020b19e83c1fb4350953a1e1a193919832
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set srcxslpaths "catalog.xml common docsrc eclipse epub extensions fo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- highlighting html htmlhelp images javahelp lib manpages \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- params profiling roundtrip slides template tools webhelp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- website xhtml xhtml-1_1 VERSION"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set srcdocpaths "AUTHORS BUGS README RELEASE-NOTES.html RELEASE-NOTES.xml \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RELEASE-NOTES.pdf RELEASE-NOTES.txt TODO VERSION NEWS COPYING"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set instxsldir "share/xsl/${name}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set instdocdir "share/doc/${name}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-xml.catalog "${prefix}/${instxsldir}/catalog.xml"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach pathname "${instxsldir} ${instdocdir}" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/${pathname}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach pathname ${srcxslpaths} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/${pathname} ${destroot}${prefix}/${instxsldir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach pathname ${srcdocpaths} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/${pathname} ${destroot}${prefix}/${instdocdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.distname ${name}
</span><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 e89e34f..6e73c33 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,34 +6,16 @@ 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 3
</span> categories textproc
platforms darwin
license MIT Permissive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description The docbook xsl stylesheets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- The DocBook XSL stylesheets are the official stylesheets for transforming\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DocBook XML documents into other document formats via XSLT.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ryandesign @ryandesign} openmaintainer
</span> homepage http://docbook.org/
github.tarball_from \
releases
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${name}-nons-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${name}-doc-${version}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums ${distname}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 63bae43e79c3b8bc3dac66711eb8c9e5ae3e4a32 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ee8b9eca0b7a8f89075832a2da7534bce8c5478fc8fc2676f512d5d87d832102 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 23400667 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${name}-doc-${version}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 f0937514b2eaff60cdeca60b7dc1e86b07bf1e09 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9bc38a3015717279a3a0620efb2d4bcace430077241ae2b0da609ba67d8340bc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 534208
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> supported_archs noarch
use_configure no
build {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,9 +26,53 @@ set srcxslpaths "assembly catalog.xml common eclipse epub epub3 extensions fo \
</span> VERSION VERSION.xsl"
set srcdocpaths "AUTHORS BUGS README RELEASE-NOTES.html RELEASE-NOTES.txt \
TODO VERSION NEWS COPYING"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set instxsldir "share/xsl/${name}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set instdocdir "share/doc/${name}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set instxsldir share/xsl/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set instdocdir share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by ${name}-nons
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 1.79.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description The DocBook XSL stylesheets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-nons {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description Non-namespaced version of the DocBook XSL stylesheets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname ${subport}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums 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><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-ns {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description Namespaced version of the DocBook XSL stylesheets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname ${name}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 425ca8723443bcd45c23d33df26e13b930b2ce42 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 316524ea444e53208a2fb90eeb676af755da96e1417835ba5f5eb719c81fa371 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 23404486
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-docs {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description Documentation for the DocBook XSL stylesheets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname ${name}-doc-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ worksrcdir ${name}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 f0937514b2eaff60cdeca60b7dc1e86b07bf1e09 \
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/doc ${destroot}${prefix}/${instdocdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description ${description} -- the official stylesheets for transforming\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DocBook XML documents into other document formats via XSLT.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} in [list "${name}-nons" "${name}-ns"]} {
</span> xml.catalog "${prefix}/${instxsldir}/catalog.xml" \
"${prefix}/${instxsldir}/catalog.sf.xml"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,23 +86,28 @@ destroot {
</span> foreach pathname ${srcdocpaths} {
copy ${worksrcpath}/${pathname} ${destroot}${prefix}/${instdocdir}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 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
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq "docbook-xsl-ns"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} eq "${name}-ns"} {
</span> reinplace {s|/cdn\.docbook\.org/release/xsl/|/docbook.sourceforge.net/release/xsl-ns/|g} ${destroot}${prefix}/${instxsldir}/catalog.sf.xml
} else {
reinplace {s|/cdn\.docbook\.org/release/xsl-nons/|/docbook.sourceforge.net/release/xsl/|g} ${destroot}${prefix}/${instxsldir}/catalog.sf.xml
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${registry.format} == "receipt_flat"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${registry.format} eq "receipt_flat"} {
</span> notes \
"######################################################################
# As the flat registry format does not support post-deactivate hooks,
# you will need to ensure that you manually remove the catalog
# entry for this port when you uninstall it. To do so, run
# \"xmlcatmgr remove nextCatalog ${prefix}/${instxsldir}/catalog.xml\".
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# \"xmlcatmgr remove nextCatalog ${prefix}/${instxsldir}/catalog.sf.xml\".
</span> ######################################################################"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} ne ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.type none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span></pre><pre style='margin:0'>
</pre>