[pkgsrc/trunk]: pkgsrc/textproc/docbook-xsl docbook-xsl: bump revision

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c7a9be88a7ad
branches:  trunk
changeset: 407470:c7a9be88a7ad
user:      adam <adam%pkgsrc.org@localhost>
date:      Sun Jan 05 18:54:40 2020 +0000

description:
docbook-xsl: bump revision

- Fix "A potential infinite template recursion was detected." error (needed for MKVToolNix).
- Tidy up the Makefile.

diffstat:

 textproc/docbook-xsl/Makefile                  |  32 ++++++++++++++++---------
 textproc/docbook-xsl/Makefile.common           |  19 ---------------
 textproc/docbook-xsl/distinfo                  |   3 +-
 textproc/docbook-xsl/patches/patch-lib_lib.xsl |  29 +++++++++++++++++++++++
 4 files changed, 51 insertions(+), 32 deletions(-)

diffs (130 lines):

diff -r 64112655e352 -r c7a9be88a7ad textproc/docbook-xsl/Makefile
--- a/textproc/docbook-xsl/Makefile     Sun Jan 05 18:46:11 2020 +0000
+++ b/textproc/docbook-xsl/Makefile     Sun Jan 05 18:54:40 2020 +0000
@@ -1,17 +1,25 @@
-# $NetBSD: Makefile,v 1.67 2019/08/11 13:23:23 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2020/01/05 18:54:40 adam Exp $
 
-PKGREVISION= 4
-.include "Makefile.common"
+DISTNAME=      docbook-xsl-1.79.1
+PKGREVISION=   5
+CATEGORIES=    textproc
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=docbook/}
+EXTRACT_SUFX=  .tar.bz2
 
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      http://docbook.sourceforge.net/
 COMMENT=       Docbook XSL modular stylesheet
 
 DEPENDS+=      docbook-xml>=4.2:../../textproc/docbook-xml
 
-USE_TOOLS+=    perl:run
+USE_LANGUAGES= # empty
+USE_TOOLS+=    pax perl:run
+NO_BUILD=      yes
 
 REPLACE_PERL+= fo/pdf2index
 
 EGDIR=         ${PREFIX}/share/examples/docbook-xsl
+XSLDIR=                ${PREFIX}/share/xsl/docbook
 # epub requires ruby, so we don't install the XSLMOD
 XSLMODS=       common eclipse epub epub3 fo highlighting html \
                htmlhelp images javahelp lib manpages params \
@@ -24,20 +32,20 @@
 
 CHECK_INTERPRETER_SKIP+=       share/xsl/docbook/epub/bin/dbtoepub
 
+post-extract:
+       ${RM} -f ${${FIND} ${WRKSRC} -type d:L:sh:=/.gitignore}
+
 do-install:
-       cd ${WRKSRC}/template && pax -rw -pp -pm . ${DESTDIR}${EGDIR}
+       cd ${WRKSRC}/template && ${PAX} -rw -pp -pm . ${DESTDIR}${EGDIR}
        ${INSTALL_DATA} ${WRKSRC}/VERSION ${DESTDIR}${XSLDIR}
        ${INSTALL_DATA} ${WRKSRC}/VERSION.xsl ${DESTDIR}${XSLDIR}
        ${INSTALL_DATA} ${WRKSRC}/catalog.xml ${DESTDIR}${XSLDIR}/catalog.xml
-       set -e; for d in ${XSLMODS}; do \
+       ${RUN} for d in ${XSLMODS}; do \
            ${ECHO} "${INSTALL_DATA_DIR} ${DESTDIR}${XSLDIR}/$$d"; \
-           ${ECHO} "cd ${WRKSRC} && pax -rw -pp -pm $$d ${DESTDIR}${XSLDIR}/"; \
-           cd ${WRKSRC} && pax -rw -pp -pm $$d ${DESTDIR}${XSLDIR}/; \
+           ${ECHO} "cd ${WRKSRC} && ${PAX} -rw -pp -pm $$d ${DESTDIR}${XSLDIR}/"; \
+           cd ${WRKSRC} && ${PAX} -rw -pp -pm $$d ${DESTDIR}${XSLDIR}/; \
        done
-       set -e; for f in `${FIND} ${DESTDIR}${XSLDIR} -name \\*.orig -print` ; do \
-               ${ECHO} "Remove .orig file $$f" ; \
-               ${RM} $$f ; \
-       done
+       ${FIND} ${DESTDIR}${XSLDIR} -name '*.orig' -exec ${RM} {} +
 
 .include "../../textproc/xmlcatmgr/catalogs.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 64112655e352 -r c7a9be88a7ad textproc/docbook-xsl/Makefile.common
--- a/textproc/docbook-xsl/Makefile.common      Sun Jan 05 18:46:11 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile.common,v 1.7 2019/12/30 06:15:18 taca Exp $
-#
-
-DISTNAME=      docbook-xsl-1.79.1
-CATEGORIES=    textproc
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=docbook/}
-EXTRACT_SUFX=  .tar.bz2
-
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://docbook.sourceforge.net/
-
-USE_LANGUAGES= # empty
-USE_TOOLS+=    pax
-NO_BUILD=      yes
-
-XSLDIR=                ${PREFIX}/share/xsl/docbook
-
-post-extract:
-       ${RUN} ${RM} -f ${${FIND} ${WRKSRC} -type d:L:sh:=/.gitignore}
diff -r 64112655e352 -r c7a9be88a7ad textproc/docbook-xsl/distinfo
--- a/textproc/docbook-xsl/distinfo     Sun Jan 05 18:46:11 2020 +0000
+++ b/textproc/docbook-xsl/distinfo     Sun Jan 05 18:54:40 2020 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.30 2016/03/05 01:12:13 ryoon Exp $
+$NetBSD: distinfo,v 1.31 2020/01/05 18:54:40 adam Exp $
 
 SHA1 (docbook-xsl-1.79.1.tar.bz2) = 7487b2acc7106253bb77fcddc7e1a9788601ad23
 RMD160 (docbook-xsl-1.79.1.tar.bz2) = 3859fa52e38e4719037a213034c6f19cb6331968
 SHA512 (docbook-xsl-1.79.1.tar.bz2) = 83325cbaf1545da6b9b8b77f5f0e6fdece26e3c455164b300a1aa3d19e3bd29ae71fd563553a714a5394968d1a65684c6c7987c77524469358d18b8c227025c7
 Size (docbook-xsl-1.79.1.tar.bz2) = 21967928 bytes
+SHA1 (patch-lib_lib.xsl) = e6e329a8df9f47992909f03f2fabc6a73bcccf8c
diff -r 64112655e352 -r c7a9be88a7ad textproc/docbook-xsl/patches/patch-lib_lib.xsl
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/docbook-xsl/patches/patch-lib_lib.xsl    Sun Jan 05 18:54:40 2020 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-lib_lib.xsl,v 1.1 2020/01/05 18:54:40 adam Exp $
+
+Use EXSLT "replace" function when available.
+https://bugs.debian.org/750593
+
+--- lib/lib.xsl.orig   2013-09-04 18:09:43.000000000 +0000
++++ lib/lib.xsl
+@@ -10,7 +10,10 @@
+      This module implements DTD-independent functions
+ 
+      ******************************************************************** -->
+-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0">
++<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
++                xmlns:str="http://exslt.org/strings";
++                exclude-result-prefixes="str"
++                version="1.0">
+ 
+ <xsl:template name="dot.count">
+   <!-- Returns the number of "." characters in a string -->
+@@ -56,6 +59,9 @@
+   <xsl:param name="replacement"/>
+ 
+   <xsl:choose>
++    <xsl:when test="function-available('str:replace')">
++      <xsl:value-of select="str:replace($string, string($target), string($replacement))"/>
++    </xsl:when>
+     <xsl:when test="contains($string, $target)">
+       <xsl:variable name="rest">
+         <xsl:call-template name="string.subst">