Use the (new) provided catalog file instead of our own (it's more complete).

Bump PKGREVISION to 2.  Closes PR pkg/32375 by Andrew Klingenberg.

4 files changed, 20 insertions, 7 deletions

diff --git a/textproc/docbook-xsl/Makefile b/textproc/docbook-xsl/Makefile
index 5351c0d197f..eecd2daaf34 100644
--- a/textproc/docbook-xsl/Makefile
+++ b/textproc/docbook-xsl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2005/12/05 20:51:02 rillig Exp $
+# $NetBSD: Makefile,v 1.32 2006/01/12 17:12:52 jmmv Exp $
 #
 
 DISTNAME=	docbook-xsl-1.69.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=docbook/}
 EXTRACT_SUFX=	.tar.bz2
@@ -23,20 +23,20 @@ XSLDIR=		${PREFIX}/share/xsl/docbook
 XSLMODS=	common extensions fo html htmlhelp images javahelp \
 		lib manpages params profiling xhtml
 
-XML_CATALOGS=	${XSLDIR}/catalog
+XML_CATALOGS=	${XSLDIR}/catalog.xml
 
 do-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	cd ${WRKSRC}/template && ${PAX} -rw -pp -pm . ${EGDIR}
 	${INSTALL_DATA_DIR} ${XSLDIR}
 	${INSTALL_DATA} ${WRKSRC}/VERSION ${XSLDIR}
+	${INSTALL_DATA} ${WRKSRC}/catalog.xml ${XSLDIR}/catalog.xml
 	@for d in ${XSLMODS}; do \
 	    ${ECHO} "${INSTALL_DATA_DIR} ${XSLDIR}/$$d"; \
 	    ${ECHO} "cd ${WRKSRC} && ${PAX} -rw -pp -pm $$d ${XSLDIR}/"; \
 	    cd ${WRKSRC} && ${PAX} -rw -pp -pm $$d ${XSLDIR}/; \
 	done
 	${RM} ${XSLDIR}/common/pi.xsl.orig
-	${INSTALL_DATA} ${FILESDIR}/catalog ${XSLDIR}/catalog
 
 .include "../../textproc/xmlcatmgr/catalogs.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/docbook-xsl/PLIST b/textproc/docbook-xsl/PLIST
index d1b63e7e9df..fee0b986370 100644
--- a/textproc/docbook-xsl/PLIST
+++ b/textproc/docbook-xsl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2005/08/13 15:21:32 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.16 2006/01/12 17:12:52 jmmv Exp $
 share/examples/docbook-xsl/ChangeLog
 share/examples/docbook-xsl/README
 share/examples/docbook-xsl/biblioentry.xsl
@@ -6,7 +6,7 @@ share/examples/docbook-xsl/testtemplate.xml
 share/examples/docbook-xsl/titlepage.xsl
 @comment in xmlcatmgr: share/xml/catalog
 share/xsl/docbook/VERSION
-share/xsl/docbook/catalog
+share/xsl/docbook/catalog.xml
 share/xsl/docbook/common/ChangeLog
 share/xsl/docbook/common/af.xml
 share/xsl/docbook/common/am.xml
diff --git a/textproc/docbook-xsl/distinfo b/textproc/docbook-xsl/distinfo
index e549a7a9bf8..cb5df80f897 100644
--- a/textproc/docbook-xsl/distinfo
+++ b/textproc/docbook-xsl/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.14 2005/09/10 12:38:30 jmmv Exp $
+$NetBSD: distinfo,v 1.15 2006/01/12 17:12:52 jmmv Exp $
 
 SHA1 (docbook-xsl-1.69.1.tar.bz2) = aaabf0e274609134e187a6c36d2be23f3471f507
 RMD160 (docbook-xsl-1.69.1.tar.bz2) = 4cc1a26acdcbe7af8f037cfb261b5e9dca15938c
 Size (docbook-xsl-1.69.1.tar.bz2) = 1058962 bytes
 SHA1 (patch-aa) = faa2fce58198f3ffde4954aed80af262116b06b1
+SHA1 (patch-ab) = 8533b3fab66cfa366efcfc9b1d6199c506fb6482
diff --git a/textproc/docbook-xsl/patches/patch-ab b/textproc/docbook-xsl/patches/patch-ab
new file mode 100644
index 00000000000..cd6fdefc90c
--- /dev/null
+++ b/textproc/docbook-xsl/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2006/01/12 17:12:52 jmmv Exp $
+
+--- catalog.xml.orig	2005-04-21 02:04:24.000000000 +0200
++++ catalog.xml
+@@ -7,6 +7,6 @@
+   <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/current/" rewritePrefix="./"/>
+ 
+   <rewriteURI uriStartString="http://docbook.sourceforge.net/release/xsl/1.69.0/" rewritePrefix="./"/>
+-  <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/1.69.0/" rewritePrefix="./"/>
++  <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/1.69.1/" rewritePrefix="./"/>
+ 
+ </catalog>