Bump PKGREVISION for teixsl-html and teixsl-fo and regenerate

distinfo, because the distfiles were updated with some functional
changes but have the same file name and version number.  Changes
include updating author's email address, correcting typos, and adding
missing HTML tags.

pkgsrc change:
  - Use XML_ENTRIES instead of installing a separate catalog file,
    because it adds only one entry.

7 files changed, 15 insertions, 34 deletions

diff --git a/textproc/teixsl-fo/Makefile b/textproc/teixsl-fo/Makefile
index 9b93dd57d7a..d57553b9792 100644
--- a/textproc/teixsl-fo/Makefile
+++ b/textproc/teixsl-fo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2004/04/27 20:53:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2004/08/03 14:10:30 minskim Exp $
 
 DISTNAME=	teixsl-fo
 PKGNAME=	${DISTNAME}-3.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.tei-c.org/Stylesheets/P4/
 EXTRACT_SUFX=	.zip
@@ -21,12 +21,12 @@ USE_BUILDLINK3=	YES
 
 XSLDIR=		${PREFIX}/share/xsl/tei/fo
 
-XML_CATALOGS=	${XSLDIR}/catalog
+XML_ENTRIES=	system "http://www.tei-c.org/Stylesheets/P4/tei.xsl" \
+		${PREFIX}/share/xsl/tei/fo/tei.xsl
 
 do-install:
 	${INSTALL_DATA_DIR} ${XSLDIR}
 	${INSTALL_DATA} ${WRKSRC}/fo/*.xsl ${XSLDIR}
-	${INSTALL_DATA} ${FILESDIR}/catalog ${XSLDIR}/catalog
 
 .include "../../textproc/xmlcatmgr/catalogs.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/teixsl-fo/PLIST b/textproc/teixsl-fo/PLIST
index df1910391ca..4b21e9f4ca2 100644
--- a/textproc/teixsl-fo/PLIST
+++ b/textproc/teixsl-fo/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/02/10 04:45:44 minskim Exp $
-share/xsl/tei/fo/catalog
+@comment $NetBSD: PLIST,v 1.3 2004/08/03 14:10:30 minskim Exp $
 share/xsl/tei/fo/tei-bib.xsl
 share/xsl/tei/fo/tei-drama.xsl
 share/xsl/tei/fo/tei-figure.xsl
diff --git a/textproc/teixsl-fo/distinfo b/textproc/teixsl-fo/distinfo
index 7a559a978e0..4ee9f4bd0c2 100644
--- a/textproc/teixsl-fo/distinfo
+++ b/textproc/teixsl-fo/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2004/03/20 19:47:18 minskim Exp $
+$NetBSD: distinfo,v 1.5 2004/08/03 14:10:30 minskim Exp $
 
-SHA1 (teixsl-fo-3.1nb1/teixsl-fo.zip) = bbef5eb73f76fd82cdef02aa4aca9079d7a38bc4
-Size (teixsl-fo-3.1nb1/teixsl-fo.zip) = 49781 bytes
+SHA1 (teixsl-fo-3.1nb2/teixsl-fo.zip) = f27e3a7fa159267327bf13f2920c8c8233119e36
+Size (teixsl-fo-3.1nb2/teixsl-fo.zip) = 49964 bytes
diff --git a/textproc/teixsl-fo/files/catalog b/textproc/teixsl-fo/files/catalog
deleted file mode 100644
index 6d8ba8e3892..00000000000
--- a/textproc/teixsl-fo/files/catalog
+++ /dev/null
@@ -1,9 +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.1.1.1 2003/12/03 23:48:06 xtraeme Exp $ -->
-
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-  <system systemId="http://www.tei-c.org/Stylesheets/P4/tei.xsl" uri="tei.xsl" />
-</catalog>
diff --git a/textproc/teixsl-html/Makefile b/textproc/teixsl-html/Makefile
index 6efdfb6c18a..f9e653820d4 100644
--- a/textproc/teixsl-html/Makefile
+++ b/textproc/teixsl-html/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2004/04/27 20:53:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2004/08/03 14:10:30 minskim Exp $
 
 DISTNAME=	teixsl-html
 PKGNAME=	${DISTNAME}-3.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.tei-c.org/Stylesheets/P4/
 EXTRACT_SUFX=	.zip
@@ -19,14 +19,14 @@ USE_BUILDLINK3=	YES
 
 TEIDIR=		${PREFIX}/share/xsl/tei
 
-XML_CATALOGS=	${TEIDIR}/html/catalog
+XML_ENTRIES=	system "http://www.tei-c.org/Stylesheets/P4/teihtml.xsl" \
+		${PREFIX}/share/xsl/tei/html/tei.xsl
 
 do-install:
 	${INSTALL_DATA_DIR} ${TEIDIR}/common
 	${INSTALL_DATA} ${WRKSRC}/common/*.xsl ${TEIDIR}/common
 	${INSTALL_DATA_DIR} ${TEIDIR}/html
 	${INSTALL_DATA} ${WRKSRC}/html/*.xsl ${TEIDIR}/html
-	${INSTALL_DATA} ${FILESDIR}/catalog ${TEIDIR}/html/catalog
 
 .include "../../textproc/xmlcatmgr/catalogs.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/teixsl-html/distinfo b/textproc/teixsl-html/distinfo
index 89afbd32f73..e3e30c57628 100644
--- a/textproc/teixsl-html/distinfo
+++ b/textproc/teixsl-html/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2004/03/20 19:47:17 minskim Exp $
+$NetBSD: distinfo,v 1.5 2004/08/03 14:10:30 minskim Exp $
 
-SHA1 (teixsl-html-3.1nb1/teixsl-html.zip) = 8f055dabb45a55e2c58a885d74c92bc522cc39ca
-Size (teixsl-html-3.1nb1/teixsl-html.zip) = 60620 bytes
+SHA1 (teixsl-html-3.1nb2/teixsl-html.zip) = 45f78cf5869d79725a45aae7cfd84d321e906b2c
+Size (teixsl-html-3.1nb2/teixsl-html.zip) = 67949 bytes
diff --git a/textproc/teixsl-html/files/catalog b/textproc/teixsl-html/files/catalog
deleted file mode 100644
index f252ac3b3c7..00000000000
--- a/textproc/teixsl-html/files/catalog
+++ /dev/null
@@ -1,9 +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.1.1.1 2003/12/03 23:49:02 xtraeme Exp $ -->
-
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-  <system systemId="http://www.tei-c.org/Stylesheets/P4/teihtml.xsl" uri="teihtml.xsl" />
-</catalog>