Index: tei-p3/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/tei-p3/Makefile,v
retrieving revision 1.2
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.2 Makefile
--- tei-p3/Makefile	21 Feb 2003 13:42:48 -0000	1.2
+++ tei-p3/Makefile	27 Jun 2003 11:04:42 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	tei
 PORTVERSION=	p3
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.tei-c.org/Vault/GL/
 DISTNAME=	teip3dtd
@@ -14,25 +15,27 @@
 MAINTAINER=	henrik.motakef@web.de
 COMMENT=	DTD of the Text Encoding Initiative
 
-RUN_DEPENDS=	${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog
+RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
-PLIST_SUB=	DTD_NAME=${PORTNAME} DTD_VERSION=${PORTVERSION} \
-		MKCATALOG=${MKCATALOG}
+PLIST_SUB=	XMLCATMGR=${XMLCATMGR} \
+		DTDDIR=${DTDDIR} \
+		CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML}
 
 SGMLDIR=	${PREFIX}/share/sgml
 INSTDIR=	${SGMLDIR}/${PORTNAME}/${PORTVERSION}
-MKCATALOG=	${PREFIX}/sbin/mkcatalog
+DTDDIR=		${PORTNAME}/${PORTVERSION}
+XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
+CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
 
 do-install:
 	@[ -d ${INSTDIR} ] || ${MKDIR} ${INSTDIR}
 	@${INSTALL_MAN} ${WRKSRC}/*.dtd ${INSTDIR}
 	@${INSTALL_MAN} ${WRKSRC}/*.ent ${INSTDIR}
-	@${SED} -e 's!%%INSTDIR%%!${INSTDIR}!' ${FILESDIR}/catalog \
-	  > ${INSTDIR}/catalog
+	@${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}
 
 post-install:
-	@${MKCATALOG} -q install ${PORTNAME}/${PORTVERSION}
+	${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${DTDDIR}/catalog 
 
 .include <bsd.port.mk>
Index: tei-p3/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/textproc/tei-p3/pkg-plist,v
retrieving revision 1.2
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.2 pkg-plist
--- tei-p3/pkg-plist	22 Feb 2003 03:18:04 -0000	1.2
+++ tei-p3/pkg-plist	27 Jun 2003 09:51:36 -0000
@@ -1,4 +1,4 @@
-@unexec %%MKCATALOG%% -q deinstall %%DTD_NAME%%/%%DTD_VERSION%%
+@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTDDIR%%/catalog
 share/sgml/tei/p3/p2ents.dtd
 share/sgml/tei/p3/tei2.dtd
 share/sgml/tei/p3/teiana2.dtd
@@ -47,6 +47,6 @@
 share/sgml/tei/p3/teitran2.ent
 share/sgml/tei/p3/teivers2.ent
 share/sgml/tei/p3/catalog
-@exec %%MKCATALOG%% -q install %%DTD_NAME%%/%%DTD_VERSION%%
+@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTDDIR%%/catalog
 @dirrm share/sgml/tei/p3
 @unexec rmdir %D/share/sgml/tei 2>/dev/null || true
Index: tei-p3/files/catalog
===================================================================
RCS file: /home/ncvs/ports/textproc/tei-p3/files/catalog,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.1 catalog
--- tei-p3/files/catalog	3 Jan 2003 12:29:44 -0000	1.1
+++ tei-p3/files/catalog	27 Jun 2003 09:50:07 -0000
@@ -1,5 +1 @@
-PUBLIC "-//TEI P3//DTD Main Document Type//EN" "%%INSTDIR%%/tei2.dtd"END-of-tei-p3/files/catalog
-exit
-
-
-
+PUBLIC "-//TEI P3//DTD Main Document Type//EN" "tei2.dtd"