docbook-xsl: update to 1.79.2nb2.

Add backwards compatibility rewrites for old master site.

Remove unused catalog file.

4 files changed, 19 insertions, 14 deletions

diff --git a/textproc/docbook-xsl/Makefile b/textproc/docbook-xsl/Makefile
index 78208c28025..afa1cf2e848 100644
--- a/textproc/docbook-xsl/Makefile
+++ b/textproc/docbook-xsl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.71 2020/03/04 10:31:11 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2020/03/05 10:38:39 wiz Exp $
 
 DISTNAME=	docbook-xsl-1.79.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=docbook/}
 GITHUB_PROJECT=	xslt10-stylesheets
diff --git a/textproc/docbook-xsl/distinfo b/textproc/docbook-xsl/distinfo
index bf59cb89afb..b4482dab995 100644
--- a/textproc/docbook-xsl/distinfo
+++ b/textproc/docbook-xsl/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.32 2020/03/04 10:11:40 wiz Exp $
+$NetBSD: distinfo,v 1.33 2020/03/05 10:38:39 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 (patch-lib_lib.xsl) = 0787b83d01871f2a22a1e4257e4dfad89221041b
diff --git a/textproc/docbook-xsl/files/catalog b/textproc/docbook-xsl/files/catalog
deleted file mode 100644
index 8d9dff96726..00000000000
--- a/textproc/docbook-xsl/files/catalog
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
-	"http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-
-<!-- $NetBSD: catalog,v 1.3 2004/12/26 15:43:01 wiz Exp $ -->
-
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-  <system systemId="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl" uri="html/docbook.xsl" />
-  <system systemId="http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl" uri="html/chunk.xsl" />
-  <system systemId="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" uri="manpages/docbook.xsl" />
-</catalog>
diff --git a/textproc/docbook-xsl/patches/patch-catalog.xml b/textproc/docbook-xsl/patches/patch-catalog.xml
new file mode 100644
index 00000000000..3e97fb7f888
--- /dev/null
+++ b/textproc/docbook-xsl/patches/patch-catalog.xml
@@ -0,0 +1,15 @@
+$NetBSD: patch-catalog.xml,v 1.1 2020/03/05 10:38:40 wiz Exp $
+
+Add backwards compatibility rewrites for old master site.
+
+--- catalog.xml.orig	2016-12-09 22:46:49.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 -->
++  <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="./"/>