Manually add each publicId of the DocBook 4.1.2 collection to the ports

catalog since this version didn't include a catalog of its own.
This should solve the problems people are seeing on clean systems.

Reported by:	paul

2 files changed, 35 insertions, 3 deletions

diff --git a/textproc/docbook-sk/Makefile b/textproc/docbook-sk/Makefile
index 45b5d8579c0e..5cd637e3e10c 100644
--- a/textproc/docbook-sk/Makefile
+++ b/textproc/docbook-sk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	docbook-sk
 PORTVERSION=	4.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.docbook.org/xml/${PORTVERSION}/
 DISTNAME=	docbkx${PORTVERSION:S/.//g}
@@ -23,11 +23,13 @@ NO_WRKSUBDIR=	yes
 PLIST_SUB=	DTD_VERSION=${PORTVERSION} \
 		XMLCATMGR=${XMLCATMGR} \
 		DOCBOOKDIR=${DOCBOOKDIR} \
-		CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML}
+		CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} \
+		CATALOG_PORTS_XML=${CATALOG_PORTS_XML}
 
 DOCBOOKDIR=	${PREFIX}/share/xml/${PORTNAME:S/-sk//}/${PORTVERSION}
 XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
 CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
+CATALOG_PORTS_XML=	${PREFIX}/share/xml/catalog.ports
 
 pre-install:
 	@[ -d ${DOCBOOKDIR}/ent ] || ${MKDIR} ${DOCBOOKDIR}/ent
@@ -39,5 +41,15 @@ do-install:
 
 post-install:
 	@${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${DOCBOOKDIR}/docbook.cat
+	@${XMLCATMGR} -c ${CATALOG_PORTS_XML} add public "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" file://${DOCBOOKDIR}/dbpoolx.mod
+	@${XMLCATMGR} -c ${CATALOG_PORTS_XML} add public "-//OASIS//DTD DocBook XML V4.1.2//EN" file://${DOCBOOKDIR}/docbookx.dtd
+	@${XMLCATMGR} -c ${CATALOG_PORTS_XML} add public "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" file://${DOCBOOKDIR}/dbcentx.mod
+	@${XMLCATMGR} -c ${CATALOG_PORTS_XML} add public "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" file://${DOCBOOKDIR}/dbnotnx.mod
+	@${XMLCATMGR} -c ${CATALOG_PORTS_XML} add public "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" file://${DOCBOOKDIR}/dbgenent.mod
+	@${XMLCATMGR} -c ${CATALOG_PORTS_XML} add public "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" file://${DOCBOOKDIR}/dbhierx.mod
+	@${XMLCATMGR} -c ${CATALOG_PORTS_XML} add public "-//OASIS//DTD XML Exchange Table Model 19990315//EN" file://${DOCBOOKDIR}/soextblx.dtd
+	@${XMLCATMGR} -c ${CATALOG_PORTS_XML} add public "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" file://${DOCBOOKDIR}/calstblx.dtd
+	@${XMLCATMGR} -c ${CATALOG_PORTS_XML} add rewriteSystem "http://www.oasis-open.org/docbook/xml/4.1.2" file://${DOCBOOKDIR}
+	@${XMLCATMGR} -c ${CATALOG_PORTS_XML} add rewriteURI "http://www.oasis-open.org/docbook/xml/4.1.2" file://${DOCBOOKDIR}
 
 .include <bsd.port.mk>
diff --git a/textproc/docbook-sk/pkg-plist b/textproc/docbook-sk/pkg-plist
index 2dc07f24ba75..f56fe56d897e 100644
--- a/textproc/docbook-sk/pkg-plist
+++ b/textproc/docbook-sk/pkg-plist
@@ -7,10 +7,30 @@ share/xml/docbook/%%DTD_VERSION%%/dbgenent.mod
 share/xml/docbook/%%DTD_VERSION%%/dbhierx.mod
 share/xml/docbook/%%DTD_VERSION%%/dbnotnx.mod
 share/xml/docbook/%%DTD_VERSION%%/dbpoolx.mod
-@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DOCBOOKDIR%%/docbook.cat
+@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove CATALOG %%DOCBOOKDIR%%/docbook.cat
 share/xml/docbook/%%DTD_VERSION%%/docbook.cat
 @exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DOCBOOKDIR%%/docbook.cat
 share/xml/docbook/%%DTD_VERSION%%/docbookx.dtd
+@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add public "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" file://%%DOCBOOKDIR%%/dbpoolx.mod
+@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add public "-//OASIS//DTD DocBook XML V4.1.2//EN" file://%%DOCBOOKDIR%%/docbookx.dtd
+@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add public "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" file://%%DOCBOOKDIR%%/dbcentx.mod
+@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add public "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" file://%%DOCBOOKDIR%%/dbnotnx.mod
+@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add public "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" file://%%DOCBOOKDIR%%/dbgenent.mod
+@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add public "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" file://%%DOCBOOKDIR%%/dbhierx.mod
+@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add public "-//OASIS//DTD XML Exchange Table Model 19990315//EN" file://%%DOCBOOKDIR%%/soextblx.dtd
+@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add public "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" file://%%DOCBOOKDIR%%/calstblx.dtd
+@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add rewriteSystem "http://www.oasis-open.org/docbook/xml/4.1.2" file://%%DOCBOOKDIR%%
+@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add rewriteURI "http://www.oasis-open.org/docbook/xml/4.1.2" file://%%DOCBOOKDIR%%
+@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove public "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN"
+@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove public "-//OASIS//DTD DocBook XML V4.1.2//EN"
+@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove public "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN"
+@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove public "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN"
+@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove public "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN"
+@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove public "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN"
+@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove public "-//OASIS//DTD XML Exchange Table Model 19990315//EN"
+@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove public "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN"
+@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove rewriteSystem "http://www.oasis-open.org/docbook/xml/4.1.2"
+@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove rewriteURI "http://www.oasis-open.org/docbook/xml/4.1.2"
 share/xml/docbook/%%DTD_VERSION%%/ent/iso-amsa.ent
 share/xml/docbook/%%DTD_VERSION%%/ent/iso-amsb.ent
 share/xml/docbook/%%DTD_VERSION%%/ent/iso-amsc.ent