4 files changed, 54 insertions, 28 deletions

diff --git a/textproc/xmlcharent/Makefile b/textproc/xmlcharent/Makefile
index 47b741074b62..fc813553fa60 100644
--- a/textproc/xmlcharent/Makefile
+++ b/textproc/xmlcharent/Makefile
@@ -6,11 +6,11 @@
 
 PORTNAME=	xmlcharent
 PORTVERSION=	0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.oasis-open.org/docbook/${PORTNAME}/${PORTVERSION}/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	XML character entities
 
 RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
@@ -28,13 +28,10 @@ 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 ${WRKSRC}/catalog.xml ${XMLDIR}
+		${FILESDIR}/catalog ${FILESDIR}/catalog.xml ${XMLDIR}
 	${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${XMLDIR}/catalog
 	${XMLCATMGR} -c ${CATALOG_PORTS_XML} add nextCatalog ${XMLDIR}/catalog.xml
 
diff --git a/textproc/xmlcharent/files/catalog b/textproc/xmlcharent/files/catalog
index 1bbcc402cf92..93ddda058172 100644
--- a/textproc/xmlcharent/files/catalog
+++ b/textproc/xmlcharent/files/catalog
@@ -1,3 +1,5 @@
+-- $FreeBSD$ --
+
 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
 "iso-lat1.ent"
 
diff --git a/textproc/xmlcharent/files/catalog.xml b/textproc/xmlcharent/files/catalog.xml
index b8cf2166f6d5..53f8d5913faa 100644
--- a/textproc/xmlcharent/files/catalog.xml
+++ b/textproc/xmlcharent/files/catalog.xml
@@ -2,26 +2,53 @@
 <!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 -->
+<!-- $FreeBSD$ -->
 
 <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" />
+  <rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xmlcharent/current/"
+                 rewritePrefix="./" />
+  <rewriteURI uriStartString="http://www.oasis-open.org/docbook/xmlcharent/current/"
+                 rewritePrefix="./" />
+  <rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xmlcharent/0.3/"
+                 rewritePrefix="./" />
+  <rewriteURI uriStartString="http://www.oasis-open.org/docbook/xmlcharent/0.3/"
+                 rewritePrefix="./" />
+
+  <public publicId="ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
+          uri="http://www.oasis-open.org/docbook/xmlcharent/current/iso-lat1.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"
+          uri="http://www.oasis-open.org/docbook/xmlcharent/current/iso-lat2.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Greek Letters//EN//XML"
+          uri="http://www.oasis-open.org/docbook/xmlcharent/current/iso-grk1.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML"
+          uri="http://www.oasis-open.org/docbook/xmlcharent/current/iso-grk2.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
+          uri="http://www.oasis-open.org/docbook/xmlcharent/current/iso-cyr1.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
+          uri="http://www.oasis-open.org/docbook/xmlcharent/current/iso-cyr2.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
+          uri="http://www.oasis-open.org/docbook/xmlcharent/current/iso-num.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
+          uri="http://www.oasis-open.org/docbook/xmlcharent/current/iso-dia.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Publishing//EN//XML"
+          uri="http://www.oasis-open.org/docbook/xmlcharent/current/iso-pub.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML"
+          uri="http://www.oasis-open.org/docbook/xmlcharent/current/iso-box.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES General Technical//EN//XML"
+          uri="http://www.oasis-open.org/docbook/xmlcharent/current/iso-tech.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Greek Symbols//EN//XML"
+          uri="http://www.oasis-open.org/docbook/xmlcharent/current/iso-grk3.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML"
+          uri="http://www.oasis-open.org/docbook/xmlcharent/current/iso-grk4.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML"
+          uri="http://www.oasis-open.org/docbook/xmlcharent/current/iso-amso.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML"
+          uri="http://www.oasis-open.org/docbook/xmlcharent/current/iso-amsb.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML"
+          uri="http://www.oasis-open.org/docbook/xmlcharent/current/iso-amsr.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML"
+          uri="http://www.oasis-open.org/docbook/xmlcharent/current/iso-amsn.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML" uri="http://www.oasis-open.org/docbook/xmlcharent/current/iso-amsa.ent" />
+  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML"
+          uri="http://www.oasis-open.org/docbook/xmlcharent/current/iso-amsc.ent" />
 </catalog>
diff --git a/textproc/xmlcharent/pkg-plist b/textproc/xmlcharent/pkg-plist
index e420e511f385..65b034931a84 100644
--- a/textproc/xmlcharent/pkg-plist
+++ b/textproc/xmlcharent/pkg-plist
@@ -1,8 +1,8 @@
 @comment $FreeBSD$
-@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%XMLDIR%%/catalog
+@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove CATALOG %%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
+@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove nextCatalog %%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