3 files changed, 31 insertions, 8 deletions

diff --git a/textproc/sdocbook-xml/Makefile b/textproc/sdocbook-xml/Makefile
index 3e87cf5d9d6f..7989a34571a9 100644
--- a/textproc/sdocbook-xml/Makefile
+++ b/textproc/sdocbook-xml/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sdocbook-xml
 PORTVERSION= 	4.1.2.5
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.oasis-open.org/docbook/xml/simple/4.1.2.5/
 DISTNAME=	simple${PORTVERSION:S/.//g}
@@ -14,15 +15,20 @@ DISTNAME=	simple${PORTVERSION:S/.//g}
 MAINTAINER=	des@FreeBSD.org
 COMMENT=	"Simplified" DocBook XML DTD
 
-RUN_DEPENDS=    ${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog
+RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
 
 USE_ZIP=	yes
 NO_BUILD=	yes
-PLIST_SUB=	MKCATALOG=${MKCATALOG} CATALOG=${CATALOG}
+WRKSRC=		${WRKDIR}
+PLIST_SUB=	XMLCATMGR=${XMLCATMGR}\
+		CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML}\
+		CATALOG_PORTS_XML=${CATALOG_PORTS_XML}\
+		XMLDIR=${SDOCBOOKDIR}
 
 SDOCBOOKDIR=	${PREFIX}/share/xml/sdocbook
-MKCATALOG=      ${LOCALBASE}/sbin/mkcatalog
-CATALOG=        ${PREFIX}/share/xml/catalog
+XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
+CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
+CATALOG_PORTS_XML=	${PREFIX}/share/xml/catalog.ports
 
 FILES=		sdbcent.mod sdbhier.mod sdbpool.mod sdocbook-custom.dtd \
 		sdocbook.css sdocbook.dtd sdocbookref-custom.dtd \
@@ -32,14 +38,19 @@ do-extract:
 	${MKDIR} ${WRKDIR}; \
 	(cd ${WRKDIR} && unzip -oq ${DISTDIR}/${DISTFILES})
 
+post-patch:
+	${SED} -e 's#@@DTDDIR@@#${SDOCBOOKDIR}#' < ${FILESDIR}/catalog.xml > ${WRKSRC}/catalog.xml
+
 do-install:
 	${MKDIR} ${SDOCBOOKDIR}
 .for i in ${FILES}
 	$(INSTALL_DATA) $(WRKDIR)/${i} $(SDOCBOOKDIR)
 .endfor
 	${INSTALL_DATA} ${FILESDIR}/catalog ${SDOCBOOKDIR}
+	${INSTALL_DATA} ${WRKDIR}/catalog.xml ${SDOCBOOKDIR}
 
 post-install:
-	${MKCATALOG} -q -c ${CATALOG} install sdocbook catalog
+	${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${SDOCBOOKDIR}/catalog
+	${XMLCATMGR} -c ${CATALOG_PORTS_XML} add nextCatalog ${SDOCBOOKDIR}/catalog.xml
 
 .include <bsd.port.mk>
diff --git a/textproc/sdocbook-xml/files/catalog.xml b/textproc/sdocbook-xml/files/catalog.xml
new file mode 100644
index 000000000000..9ad01221cb7f
--- /dev/null
+++ b/textproc/sdocbook-xml/files/catalog.xml
@@ -0,0 +1,10 @@
+<?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">
+
+<!-- Created by xmlcatmgr-0.2 -->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  <public publicId="-//OASIS//DTD Simplified DocBook XML V4.1.2.5//EN" uri="file://@@DTDDIR@@/sdocbook.dtd" />
+  <public publicId="-//OASIS//DTD Simplified DocBook RefEntry XML V4.1.2.5//EN" uri="file://@@DTDDIR@@/sdocbookref.dtd" />
+</catalog>
diff --git a/textproc/sdocbook-xml/pkg-plist b/textproc/sdocbook-xml/pkg-plist
index 14f0f1781954..90c735c7ce5e 100644
--- a/textproc/sdocbook-xml/pkg-plist
+++ b/textproc/sdocbook-xml/pkg-plist
@@ -1,7 +1,9 @@
-share/xml/catalog
-@unexec %%MKCATALOG%% -q -c%%CATALOG%% deinstall sdocbook catalog
+@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%XMLDIR%%/catalog
 share/xml/sdocbook/catalog
-@exec %%MKCATALOG%% -q -c%%CATALOG%% install sdocbook catalog
+@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%XMLDIR%%/catalog
+@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove %%XMLDIR%%/catalog.xml
+share/xml/sdocbook/catalog.xml
+@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add nextCatalog %%XMLDIR%%/catalog.xml
 share/xml/sdocbook/sdbcent.mod
 share/xml/sdocbook/sdbhier.mod
 share/xml/sdocbook/sdbpool.mod