Index: openjade/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/openjade/Makefile,v
retrieving revision 1.38
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.38 Makefile
--- openjade/Makefile	28 Feb 2003 16:41:50 -0000	1.38
+++ openjade/Makefile	27 Jun 2003 11:04:11 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	openjade
 PORTVERSION=	1.3.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +16,7 @@
 COMMENT=	Object-oriented SGML/XML parser toolkit and DSSSL engine
 
 LIB_DEPENDS=	osp.3:${PORTSDIR}/textproc/opensp
-RUN_DEPENDS=	${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog
+RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
 
 USE_GMAKE=	YES
 USE_LIBTOOL=	YES
@@ -24,13 +24,15 @@
 CONFIGURE_ARGS=	--enable-default-catalog=${PREFIX}/share/sgml/catalog \
 		--datadir=${PREFIX}/share/sgml/openjade
 INSTALLS_SHLIB=	yes
-PLIST_SUB=	MKCATALOG=${MKCATALOG}
+PLIST_SUB=	XMLCATMGR=${XMLCATMGR}
+PLIST_SUB+=	CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML}
 
-MKCATALOG=	${PREFIX}/sbin/mkcatalog
+CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
+XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/dsssl/* ${PREFIX}/share/sgml/openjade
-	@${MKCATALOG} -q install openjade
+	@${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG openjade/catalog
 
 .include <bsd.port.pre.mk>
 
Index: openjade/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/textproc/openjade/pkg-plist,v
retrieving revision 1.18
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.18 pkg-plist
--- openjade/pkg-plist	28 Feb 2003 16:41:50 -0000	1.18
+++ openjade/pkg-plist	27 Jun 2003 09:26:44 -0000
@@ -9,7 +9,7 @@
 lib/libostyle.a
 lib/libostyle.so
 lib/libostyle.so.0
-@unexec %%MKCATALOG%% -q deinstall openjade
+@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove openjade/catalog
 share/sgml/openjade/README.jadetex
 share/sgml/openjade/builtins.dsl
 share/sgml/openjade/catalog
@@ -19,4 +19,4 @@
 share/sgml/openjade/extensions.dsl
 share/sgml/openjade/fot.dtd
 share/sgml/openjade/style-sheet.dtd
-@exec %%MKCATALOG%% -q install openjade
+@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add openjade/catalog