3 files changed, 50 insertions, 3 deletions

diff --git a/textproc/xmlcharent/Makefile b/textproc/xmlcharent/Makefile
index 0fb8d0499130..47b741074b62 100644
--- a/textproc/xmlcharent/Makefile
+++ b/textproc/xmlcharent/Makefile
@@ -1,5 +1,4 @@
-# New ports collection makefile for:   xmlcharent
-# Date created:                31 January 2002
+# New ports collection makefile for:   xmlcharent # Date created:                31 January 2002
 # Whom:                        Kimura Fuyuki <fuyuki@mj.0038.net>
 #
 # $FreeBSD$
@@ -7,20 +6,36 @@
 
 PORTNAME=	xmlcharent
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.oasis-open.org/docbook/${PORTNAME}/${PORTVERSION}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XML character entities
 
+RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
+
 USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
+PLIST_SUB=	XMLCATMGR=${XMLCATMGR}
+PLIST_SUB+=	XMLDIR=${XMLDIR}
+PLIST_SUB+=	CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML}
+PLIST_SUB+=	CATALOG_PORTS_XML=${CATALOG_PORTS_XML}
 
 XMLDIR=		${PREFIX}/share/xml/${PORTNAME}
+XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
+CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
+CATALOG_PORTS_XML=	${PREFIX}/share/xml/catalog.ports
+
+post-patch:
+	${SED} -e 's#@@XMLDIR@@#${XMLDIR}#' < ${FILESDIR}/catalog.xml > ${WRKSRC}/catalog.xml
 
 do-install:
 	${MKDIR} ${XMLDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.ent ${FILESDIR}/catalog ${XMLDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.ent\
+		${FILESDIR}/catalog ${WRKSRC}/catalog.xml ${XMLDIR}
+	${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${XMLDIR}/catalog
+	${XMLCATMGR} -c ${CATALOG_PORTS_XML} add nextCatalog ${XMLDIR}/catalog.xml
 
 .include <bsd.port.mk>
diff --git a/textproc/xmlcharent/files/catalog.xml b/textproc/xmlcharent/files/catalog.xml
new file mode 100644
index 000000000000..b8cf2166f6d5
--- /dev/null
+++ b/textproc/xmlcharent/files/catalog.xml
@@ -0,0 +1,27 @@
+<?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="ISO 8879:1986//ENTITIES Added Latin 1//EN//XML" uri="file://@@XMLDIR@@/iso-lat1.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Added Latin 2//EN//XML" uri="file://@@XMLDIR@@/iso-lat2.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Greek Letters//EN//XML" uri="file://@@XMLDIR@@/iso-grk1.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML" uri="file://@@XMLDIR@@/iso-grk2.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML" uri="file://@@XMLDIR@@/iso-cyr1.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML" uri="file://@@XMLDIR@@/iso-cyr2.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML" uri="file://@@XMLDIR@@/iso-num.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML" uri="file://@@XMLDIR@@/iso-dia.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Publishing//EN//XML" uri="file://@@XMLDIR@@/iso-pub.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML" uri="file://@@XMLDIR@@/iso-box.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES General Technical//EN//XML" uri="file://@@XMLDIR@@/iso-tech.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Greek Symbols//EN//XML" uri="file://@@XMLDIR@@/iso-grk3.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML" uri="file://@@XMLDIR@@/iso-grk4.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML" uri="file://@@XMLDIR@@/iso-amso.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML" uri="file://@@XMLDIR@@/iso-amsb.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML" uri="file://@@XMLDIR@@/iso-amsr.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML" uri="file://@@XMLDIR@@/iso-amsn.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML" uri="file://@@XMLDIR@@/iso-amsa.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML" uri="file://@@XMLDIR@@/iso-amsc.ent" />
+</catalog>
diff --git a/textproc/xmlcharent/pkg-plist b/textproc/xmlcharent/pkg-plist
index 493b6f331921..e420e511f385 100644
--- a/textproc/xmlcharent/pkg-plist
+++ b/textproc/xmlcharent/pkg-plist
@@ -1,5 +1,10 @@
 @comment $FreeBSD$
+@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%XMLDIR%%/catalog
 share/xml/xmlcharent/catalog
+@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%XMLDIR%%/catalog
+@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove %%XMLDIR%%/catalog.xml
+share/xml/xmlcharent/catalog.xml
+@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add nextCatalog %%XMLDIR%%/catalog.xml
 share/xml/xmlcharent/iso-amsa.ent
 share/xml/xmlcharent/iso-amsb.ent
 share/xml/xmlcharent/iso-amsc.ent