Register the installed catalog file in share/sgml/catalog using xmlcatmgr.

Bump PKGREVISION to 1.

4 files changed, 19 insertions, 6 deletions

diff --git a/textproc/iso12083/Makefile b/textproc/iso12083/Makefile
index 77767504ff2..354ff874ce7 100644
--- a/textproc/iso12083/Makefile
+++ b/textproc/iso12083/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:50 agc Exp $
+# $NetBSD: Makefile,v 1.6 2003/01/11 22:06:44 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/06/27 05:19:39 asami Exp
 #
 
 DISTNAME=	iso12083-1993
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://info.ex.ac.uk/pub/SGML/ISO-12083/ \
 		ftp://ftp.ifi.uio.no/pub/SGML/ISO12083/ \
@@ -19,6 +20,7 @@ NO_MTREE=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}
 EXTRACT_ONLY=	# empty
+USE_BUILDLINK2=	yes
 
 INSTDIR=	${PREFIX}/share/sgml/iso12083
 
@@ -30,5 +32,8 @@ do-install:
 		${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$$i ${INSTDIR}/$$i; \
 	done
 	@${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/catalog
+	${PREFIX}/bin/xmlcatmgr -c ${PREFIX}/share/sgml/catalog add \
+		CATALOG ${INSTDIR}/catalog
 
+.include "../../textproc/xmlcatmgr/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/iso12083/PLIST b/textproc/iso12083/PLIST
index 1e20631a291..9c129d07e5f 100644
--- a/textproc/iso12083/PLIST
+++ b/textproc/iso12083/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/09 16:01:45 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/01/11 22:06:44 jmmv Exp $
 share/sgml/iso12083/article.dtd
 share/sgml/iso12083/book.dtd
 share/sgml/iso12083/maths.dtd
 share/sgml/iso12083/serial.dtd
 share/sgml/iso12083/catalog
+@exec %D/bin/xmlcatmgr -c %D/share/sgml/catalog add CATALOG %D/share/sgml/iso12083/catalog
+@unexec %D/bin/xmlcatmgr -c %D/share/sgml/catalog remove %D/share/sgml/iso12083/catalog
 @dirrm share/sgml/iso12083
-@unexec ${RMDIR} %D/share/sgml 2>/dev/null || ${TRUE}
+@comment in xmlcatmgr: @dirrm share/sgml
diff --git a/textproc/iso8879/Makefile b/textproc/iso8879/Makefile
index 1e028feee9f..9cf4f27132f 100644
--- a/textproc/iso8879/Makefile
+++ b/textproc/iso8879/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2002/09/21 10:46:45 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2003/01/11 22:07:17 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.9 1999/02/11 16:01:16 jfieber Exp
 #
 
 DISTNAME=	isoENTS
 PKGNAME=	iso8879-1986
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://fallout.campusview.indiana.edu/ports/distfiles/
 EXTRACT_SUFX=	.zip
@@ -28,5 +29,8 @@ do-install:
 	@${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/catalog
 	@${CHMOD} ${SHAREMODE} ${INSTDIR}/*
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
+	${PREFIX}/bin/xmlcatmgr -c ${PREFIX}/share/sgml/catalog add \
+		CATALOG ${INSTDIR}/catalog
 
+.include "../../textproc/xmlcatmgr/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/iso8879/PLIST b/textproc/iso8879/PLIST
index 4da85047175..aeea38ab264 100644
--- a/textproc/iso8879/PLIST
+++ b/textproc/iso8879/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/09 16:01:45 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/01/11 22:07:17 jmmv Exp $
 share/sgml/iso8879/ISOamsa
 share/sgml/iso8879/ISOamsb
 share/sgml/iso8879/ISOamsc
@@ -19,5 +19,7 @@ share/sgml/iso8879/ISOnum
 share/sgml/iso8879/ISOpub
 share/sgml/iso8879/ISOtech
 share/sgml/iso8879/catalog
+@exec %D/bin/xmlcatmgr -c %D/share/sgml/catalog add CATALOG %D/share/sgml/iso8879/catalog
+@unexec %D/bin/xmlcatmgr -c %D/share/sgml/catalog remove %D/share/sgml/iso8879/catalog
 @dirrm share/sgml/iso8879
-@unexec ${RMDIR} %D/share/sgml 2>/dev/null || ${TRUE}
+@comment in xmlcatmgr: @dirrm share/sgml