Received: by mail.netbsd.org (Postfix, from userid 605) id C6C1184D27; Sun, 5 Jan 2020 18:54:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4DDDB84CEF for ; Sun, 5 Jan 2020 18:54:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id zKnoIVzMzLjn for ; Sun, 5 Jan 2020 18:54:40 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 786FD84CE9 for ; Sun, 5 Jan 2020 18:54:40 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 6B1FDFA97; Sun, 5 Jan 2020 18:54:40 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1578250480168730" MIME-Version: 1.0 Date: Sun, 5 Jan 2020 18:54:40 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/textproc/docbook-xsl To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20200105185440.6B1FDFA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1578250480168730 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Sun Jan 5 18:54:40 UTC 2020 Modified Files: pkgsrc/textproc/docbook-xsl: Makefile distinfo Added Files: pkgsrc/textproc/docbook-xsl/patches: patch-lib_lib.xsl Removed Files: pkgsrc/textproc/docbook-xsl: Makefile.common Log Message: docbook-xsl: bump revision - Fix "A potential infinite template recursion was detected." error (needed for MKVToolNix). - Tidy up the Makefile. To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 pkgsrc/textproc/docbook-xsl/Makefile cvs rdiff -u -r1.7 -r0 pkgsrc/textproc/docbook-xsl/Makefile.common cvs rdiff -u -r1.30 -r1.31 pkgsrc/textproc/docbook-xsl/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/docbook-xsl/patches/patch-lib_lib.xsl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1578250480168730 Content-Disposition: inline Content-Length: 4703 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/docbook-xsl/Makefile diff -u pkgsrc/textproc/docbook-xsl/Makefile:1.67 pkgsrc/textproc/docbook-xsl/Makefile:1.68 --- pkgsrc/textproc/docbook-xsl/Makefile:1.67 Sun Aug 11 13:23:23 2019 +++ pkgsrc/textproc/docbook-xsl/Makefile Sun Jan 5 18:54:40 2020 @@ -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 +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 @@ INSTALLATION_DIRS= ${EGDIR} ${XSLDIR} 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}/; \ - done - set -e; for f in `${FIND} ${DESTDIR}${XSLDIR} -name \\*.orig -print` ; do \ - ${ECHO} "Remove .orig file $$f" ; \ - ${RM} $$f ; \ + ${ECHO} "cd ${WRKSRC} && ${PAX} -rw -pp -pm $$d ${DESTDIR}${XSLDIR}/"; \ + cd ${WRKSRC} && ${PAX} -rw -pp -pm $$d ${DESTDIR}${XSLDIR}/; \ done + ${FIND} ${DESTDIR}${XSLDIR} -name '*.orig' -exec ${RM} {} + .include "../../textproc/xmlcatmgr/catalogs.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/textproc/docbook-xsl/distinfo diff -u pkgsrc/textproc/docbook-xsl/distinfo:1.30 pkgsrc/textproc/docbook-xsl/distinfo:1.31 --- pkgsrc/textproc/docbook-xsl/distinfo:1.30 Sat Mar 5 01:12:13 2016 +++ pkgsrc/textproc/docbook-xsl/distinfo Sun Jan 5 18:54:40 2020 @@ -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 Added files: Index: pkgsrc/textproc/docbook-xsl/patches/patch-lib_lib.xsl diff -u /dev/null pkgsrc/textproc/docbook-xsl/patches/patch-lib_lib.xsl:1.1 --- /dev/null Sun Jan 5 18:54:40 2020 +++ pkgsrc/textproc/docbook-xsl/patches/patch-lib_lib.xsl Sun Jan 5 18:54:40 2020 @@ -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 + + ******************************************************************** --> +- ++ + + + +@@ -56,6 +59,9 @@ + + + ++ ++ ++ + + + --_----------=_1578250480168730--