Sat Mar 28 18:36:42 2020 UTC ()
docbook-xsl: update to 1.79.2nb3.

Switch to 'nons' variant of distribution.

Hopefully fixes PR 55122 by martin@


(wiz)
diff -r1.72 -r1.73 pkgsrc/textproc/docbook-xsl/Makefile
diff -r1.33 -r1.34 pkgsrc/textproc/docbook-xsl/distinfo
diff -r1.1 -r1.2 pkgsrc/textproc/docbook-xsl/patches/patch-catalog.xml
cvs diff -r1.72 -r1.73 pkgsrc/textproc/docbook-xsl/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/docbook-xsl/Makefile 2020/03/05 10:38:39 1.72
+++ pkgsrc/textproc/docbook-xsl/Makefile 2020/03/28 18:36:42 1.73
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.72 2020/03/05 10:38:39 wiz Exp $ 1# $NetBSD: Makefile,v 1.73 2020/03/28 18:36:42 wiz Exp $
2 2
3DISTNAME= docbook-xsl-1.79.2 3DISTNAME= docbook-xsl-nons-1.79.2
4PKGREVISION= 2 4PKGNAME= ${DISTNAME:S/-nons//}
 5PKGREVISION= 3
5CATEGORIES= textproc 6CATEGORIES= textproc
6MASTER_SITES= ${MASTER_SITE_GITHUB:=docbook/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=docbook/}
7GITHUB_PROJECT= xslt10-stylesheets 8GITHUB_PROJECT= xslt10-stylesheets
8GITHUB_RELEASE= release/${PKGVERSION_NOREV} 9GITHUB_RELEASE= release/${PKGVERSION_NOREV}
9EXTRACT_SUFX= .tar.bz2 10EXTRACT_SUFX= .tar.bz2
10 11
11MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://github.com/docbook/xslt10-stylesheets/ 13HOMEPAGE= https://github.com/docbook/xslt10-stylesheets/
13COMMENT= Docbook XSL modular stylesheet 14COMMENT= Docbook XSL modular stylesheet
14 15
15DEPENDS+= docbook-xml>=4.2:../../textproc/docbook-xml 16DEPENDS+= docbook-xml>=4.2:../../textproc/docbook-xml
16 17
17USE_LANGUAGES= # empty 18USE_LANGUAGES= # empty
cvs diff -r1.33 -r1.34 pkgsrc/textproc/docbook-xsl/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/docbook-xsl/distinfo 2020/03/05 10:38:39 1.33
+++ pkgsrc/textproc/docbook-xsl/distinfo 2020/03/28 18:36:42 1.34
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.33 2020/03/05 10:38:39 wiz Exp $ 1$NetBSD: distinfo,v 1.34 2020/03/28 18:36:42 wiz Exp $
2 2
3SHA1 (docbook-xsl-1.79.2.tar.bz2) = 42c66d90d5febfccc192b0726bcf1554af6eb792 3SHA1 (docbook-xsl-nons-1.79.2.tar.bz2) = fb4f60b3968777b5a794d1e1f9e5867b04517425
4RMD160 (docbook-xsl-1.79.2.tar.bz2) = 425ca8723443bcd45c23d33df26e13b930b2ce42 4RMD160 (docbook-xsl-nons-1.79.2.tar.bz2) = 63bae43e79c3b8bc3dac66711eb8c9e5ae3e4a32
5SHA512 (docbook-xsl-1.79.2.tar.bz2) = dc5a2f08a804d0b2badb167b11fe22d53d7861e6238690e09507d09a696e7dce6b0da6e0dbfe84275db23d71006a4b89e3348eb271052341091a26395ec5862c 5SHA512 (docbook-xsl-nons-1.79.2.tar.bz2) = d19aad5ae91c7f9a9690836bd472ec6e01a29eaeac6b1838b5c9ea54e2ef4cc90f515d7b6640fe94e909a5a51eee80cd32e2ccbee457de6f0c6652ea43325d7d
6Size (docbook-xsl-1.79.2.tar.bz2) = 23404486 bytes 6Size (docbook-xsl-nons-1.79.2.tar.bz2) = 23400667 bytes
7SHA1 (patch-catalog.xml) = 0799da8568a75fa920b94d8b06f0816fc26a6f48 7SHA1 (patch-catalog.xml) = 8bf9b6f039bd1a6dc4e41a870163ac3a2a445bcc
8SHA1 (patch-lib_lib.xsl) = 0787b83d01871f2a22a1e4257e4dfad89221041b 8SHA1 (patch-lib_lib.xsl) = 0787b83d01871f2a22a1e4257e4dfad89221041b
cvs diff -r1.1 -r1.2 pkgsrc/textproc/docbook-xsl/patches/patch-catalog.xml (expand / switch to unified diff)

--- pkgsrc/textproc/docbook-xsl/patches/patch-catalog.xml 2020/03/05 10:38:40 1.1
+++ pkgsrc/textproc/docbook-xsl/patches/patch-catalog.xml 2020/03/28 18:36:42 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-catalog.xml,v 1.1 2020/03/05 10:38:40 wiz Exp $ 1$NetBSD: patch-catalog.xml,v 1.2 2020/03/28 18:36:42 wiz Exp $
2 2
3Add backwards compatibility rewrites for old master site. 3Add backwards compatibility rewrites for old master site.
4 4
5--- catalog.xml.orig 2016-12-09 22:46:49.000000000 +0000 5--- catalog.xml.orig 2016-12-09 22:47:33.000000000 +0000
6+++ catalog.xml 6+++ catalog.xml
7@@ -1,6 +1,8 @@ 7@@ -1,6 +1,8 @@
8 <?xml version="1.0" encoding="utf-8"?> 8 <?xml version="1.0" encoding="utf-8"?>
9 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> 9 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
10 <!-- XML Catalog file for DocBook XSL Stylesheets v1.79.2 --> 10 <!-- XML Catalog file for DocBook XSL-NONS v1.79.2 -->
11+ <rewriteURI uriStartString="http://docbook.sourceforge.net/release/xsl/current/" rewritePrefix="./"/> 11+ <rewriteURI uriStartString="http://docbook.sourceforge.net/release/xsl/current/" rewritePrefix="./"/>
12+ <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/current/" rewritePrefix="./"/> 12+ <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/current/" rewritePrefix="./"/>
13 <rewriteURI uriStartString="http://cdn.docbook.org/release/xsl/current/" rewritePrefix="./"/> 13 <rewriteURI uriStartString="http://cdn.docbook.org/release/xsl-nons/current/" rewritePrefix="./"/>
14 <rewriteSystem systemIdStartString="http://cdn.docbook.org/release/xsl/current/" rewritePrefix="./"/> 14 <rewriteSystem systemIdStartString="http://cdn.docbook.org/release/xsl-nons/current/" rewritePrefix="./"/>
15 <rewriteURI uriStartString="http://cdn.docbook.org/release/xsl/1.79.2/" rewritePrefix="./"/> 15 <rewriteURI uriStartString="http://cdn.docbook.org/release/xsl-nons/1.79.2/" rewritePrefix="./"/>