CVS commit: pkgsrc/textproc/docbook-xsl

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Mar 28 18:36:42 UTC 2020

Modified Files:
        pkgsrc/textproc/docbook-xsl: Makefile distinfo
        pkgsrc/textproc/docbook-xsl/patches: patch-catalog.xml

Log Message:
docbook-xsl: update to 1.79.2nb3.

Switch to 'nons' variant of distribution.

Hopefully fixes PR 55122 by martin@


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 pkgsrc/textproc/docbook-xsl/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/textproc/docbook-xsl/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/textproc/docbook-xsl/patches/patch-catalog.xml

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/docbook-xsl/Makefile
diff -u pkgsrc/textproc/docbook-xsl/Makefile:1.72 pkgsrc/textproc/docbook-xsl/Makefile:1.73
--- pkgsrc/textproc/docbook-xsl/Makefile:1.72   Thu Mar  5 10:38:39 2020
+++ pkgsrc/textproc/docbook-xsl/Makefile        Sat Mar 28 18:36:42 2020
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.72 2020/03/05 10:38:39 wiz Exp $
+# $NetBSD: Makefile,v 1.73 2020/03/28 18:36:42 wiz Exp $
 
-DISTNAME=      docbook-xsl-1.79.2
-PKGREVISION=   2
+DISTNAME=      docbook-xsl-nons-1.79.2
+PKGNAME=       ${DISTNAME:S/-nons//}
+PKGREVISION=   3
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=docbook/}
 GITHUB_PROJECT=        xslt10-stylesheets

Index: pkgsrc/textproc/docbook-xsl/distinfo
diff -u pkgsrc/textproc/docbook-xsl/distinfo:1.33 pkgsrc/textproc/docbook-xsl/distinfo:1.34
--- pkgsrc/textproc/docbook-xsl/distinfo:1.33   Thu Mar  5 10:38:39 2020
+++ pkgsrc/textproc/docbook-xsl/distinfo        Sat Mar 28 18:36:42 2020
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.33 2020/03/05 10:38:39 wiz Exp $
+$NetBSD: distinfo,v 1.34 2020/03/28 18:36:42 wiz Exp $
 
-SHA1 (docbook-xsl-1.79.2.tar.bz2) = 42c66d90d5febfccc192b0726bcf1554af6eb792
-RMD160 (docbook-xsl-1.79.2.tar.bz2) = 425ca8723443bcd45c23d33df26e13b930b2ce42
-SHA512 (docbook-xsl-1.79.2.tar.bz2) = dc5a2f08a804d0b2badb167b11fe22d53d7861e6238690e09507d09a696e7dce6b0da6e0dbfe84275db23d71006a4b89e3348eb271052341091a26395ec5862c
-Size (docbook-xsl-1.79.2.tar.bz2) = 23404486 bytes
-SHA1 (patch-catalog.xml) = 0799da8568a75fa920b94d8b06f0816fc26a6f48
+SHA1 (docbook-xsl-nons-1.79.2.tar.bz2) = fb4f60b3968777b5a794d1e1f9e5867b04517425
+RMD160 (docbook-xsl-nons-1.79.2.tar.bz2) = 63bae43e79c3b8bc3dac66711eb8c9e5ae3e4a32
+SHA512 (docbook-xsl-nons-1.79.2.tar.bz2) = d19aad5ae91c7f9a9690836bd472ec6e01a29eaeac6b1838b5c9ea54e2ef4cc90f515d7b6640fe94e909a5a51eee80cd32e2ccbee457de6f0c6652ea43325d7d
+Size (docbook-xsl-nons-1.79.2.tar.bz2) = 23400667 bytes
+SHA1 (patch-catalog.xml) = 8bf9b6f039bd1a6dc4e41a870163ac3a2a445bcc
 SHA1 (patch-lib_lib.xsl) = 0787b83d01871f2a22a1e4257e4dfad89221041b

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