Install sane catalog files for DocBook 4.1 and 4.2. Closes PR pkg/20339 by

Joachim Koenig-Baltes.  Bump PKGREVISION to 3.
Also fix trailing whitespace to make pkglint happy.

3 files changed, 60 insertions, 5 deletions

diff --git a/textproc/docbook/Makefile b/textproc/docbook/Makefile
index eae2b74a6c8..014a2c321ca 100644
--- a/textproc/docbook/Makefile
+++ b/textproc/docbook/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2003/02/26 01:00:09 uebayasi Exp $
+# $NetBSD: Makefile,v 1.21 2003/03/22 10:31:06 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.4 1998/06/27 05:19:35 asami Exp
 #
 
 DISTNAME=	docbook-4.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	\
 		http://www.oasis-open.org/docbook/sgml/4.2/ \
@@ -32,7 +32,7 @@ INSTDIR=	${PREFIX}/share/sgml/docbook
 ISOCAT=		${PREFIX}/share/sgml/iso8879/catalog
 
 SGML_CATALOGS=
-.for ver in 2.4.1 3.0 3.1 4.0 4.1 4.2	
+.for ver in 2.4.1 3.0 3.1 4.0 4.1 4.2
 SGML_CATALOGS+=	${INSTDIR}/${ver}/catalog
 .endfor
 .undef ver
@@ -79,14 +79,14 @@ do-install:
 	# 4.1:
 	#
 	@(cd ${INSTDIR}/4.1; unzip ${DISTDIR}/docbk41.zip)
-	@${EGREP} '^PUBLIC.*(DocBook|Table)' ${INSTDIR}/4.1/docbook.cat >${INSTDIR}/4.1/catalog
+	@${INSTALL_DATA} ${FILESDIR}/catalog41 ${INSTDIR}/4.1/catalog
 	@${ECHO} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/4.1/catalog
 	@${CHMOD} ${SHAREMODE} ${INSTDIR}/4.1/*
 	#
 	# 4.2:
 	#
 	@(cd ${INSTDIR}/4.2; unzip ${DISTDIR}/docbook-4.2.zip)
-	@${EGREP} '^PUBLIC.*(DocBook|Table)' ${INSTDIR}/4.2/docbook.cat >${INSTDIR}/4.2/catalog
+	@${INSTALL_DATA} ${FILESDIR}/catalog42 ${INSTDIR}/4.2/catalog
 	@${ECHO} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/4.2/catalog
 	@${CHMOD} ${SHAREMODE} ${INSTDIR}/4.2/*
 	#
diff --git a/textproc/docbook/files/catalog41 b/textproc/docbook/files/catalog41
new file mode 100644
index 00000000000..dffbfc270b7
--- /dev/null
+++ b/textproc/docbook/files/catalog41
@@ -0,0 +1,26 @@
+-- Catalog file for DocBook V4.1 --
+
+DTDDECL "-//OASIS//DTD DocBook V4.1//EN"
+        "docbook.dcl"
+
+PUBLIC "-//OASIS//DTD DocBook V4.1//EN"
+       "docbook.dtd"
+
+PUBLIC "-//USA-DOD//DTD Table Model 951010//EN"
+       "cals-tbl.dtd"
+
+PUBLIC "-//OASIS//ELEMENTS DocBook Information Pool V4.1//EN"
+       "dbpool.mod"
+
+PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.1//EN"
+       "dbhier.mod"
+
+PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.1//EN"
+       "dbgenent.mod"
+
+PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.1//EN"
+       "dbnotn.mod"
+
+PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.1//EN"
+       "dbcent.mod"
+
diff --git a/textproc/docbook/files/catalog42 b/textproc/docbook/files/catalog42
new file mode 100644
index 00000000000..dd93acef915
--- /dev/null
+++ b/textproc/docbook/files/catalog42
@@ -0,0 +1,29 @@
+-- Catalog file for DocBook V4.2 --
+
+PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
+       "docbook.dtd"
+
+PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+       "docbookx.dtd"
+
+PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.2//EN"
+       "calstblx.dtd"
+
+PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN"
+       "soextblx.dtd"
+
+PUBLIC "-//OASIS//ELEMENTS DocBook Information Pool V4.2//EN"
+       "dbpoolx.mod"
+
+PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2//EN"
+       "dbhierx.mod"
+
+PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.2//EN"
+       "dbgenent.mod"
+
+PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.2//EN"
+       "dbnotnx.mod"
+
+PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.2//EN"
+       "dbcentx.mod"
+