Use textproc/xmlcatmgr/catalogs.mk to register the installed catalog files,

through the SGML_CATALOGS variable.  Bump PKGREVISION.

8 files changed, 29 insertions, 47 deletions

diff --git a/textproc/docbook/Makefile b/textproc/docbook/Makefile
index a328bdc60c9..4926883a1c6 100644
--- a/textproc/docbook/Makefile
+++ b/textproc/docbook/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2003/01/11 22:11:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.19 2003/01/29 21:15:08 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.4 1998/06/27 05:19:35 asami Exp
 #
 
 DISTNAME=	docbook-4.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	\
 		http://www.oasis-open.org/docbook/sgml/4.2/ \
@@ -27,10 +27,17 @@ USE_BUILDLINK2=	yes
 EXTRACT_ONLY=	# empty
 NO_BUILD=       yes
 WRKSRC=		${WRKDIR}
+USE_BUILDLINK2=	yes
 
 INSTDIR=	${PREFIX}/share/sgml/docbook
 ISOCAT=		${PREFIX}/share/sgml/iso8879/catalog
 
+SGML_CATALOGS=
+.for ver in 2.4.1 3.0 3.1 4.0 4.1 4.2	
+SGML_CATALOGS+=	${INSTDIR}/${ver}/catalog
+.endfor
+.undef ver
+
 pre-install:
 	${INSTALL_DATA_DIR} ${INSTDIR}/2.4.1
 	@[ -d ${INSTDIR}/3.0 ] || ${INSTALL_DATA_DIR} ${INSTDIR}/3.0
@@ -87,13 +94,6 @@ do-install:
 	# General cleanup
 	#
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
-	#
-	# Register SGML catalogs
-	#
-.for ver in 2.4.1 3.0 3.1 4.0 4.1 4.2	
-	${PREFIX}/bin/xmlcatmgr -c ${PREFIX}/share/sgml/catalog add \
-		CATALOG ${INSTDIR}/${ver}/catalog
-.endfor
 
-.include "../../textproc/xmlcatmgr/buildlink2.mk"
+.include "../../textproc/xmlcatmgr/catalogs.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/docbook/PLIST b/textproc/docbook/PLIST
index f468f62a83e..cebd1afece4 100644
--- a/textproc/docbook/PLIST
+++ b/textproc/docbook/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/01/11 22:11:50 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/01/29 21:15:08 jmmv Exp $
 share/sgml/docbook/2.4.1/241chg.txt
 share/sgml/docbook/2.4.1/announce.txt
 share/sgml/docbook/2.4.1/calstbl.mod
@@ -78,18 +78,6 @@ share/sgml/docbook/4.2/docbook.dcl
 share/sgml/docbook/4.2/docbook.dtd
 share/sgml/docbook/4.2/docbookx.dtd
 share/sgml/docbook/4.2/soextblx.dtd
-@exec %D/bin/xmlcatmgr -c %D/share/sgml/catalog add CATALOG %D/share/sgml/docbook/2.4.1/catalog
-@exec %D/bin/xmlcatmgr -c %D/share/sgml/catalog add CATALOG %D/share/sgml/docbook/3.0/catalog
-@exec %D/bin/xmlcatmgr -c %D/share/sgml/catalog add CATALOG %D/share/sgml/docbook/3.1/catalog
-@exec %D/bin/xmlcatmgr -c %D/share/sgml/catalog add CATALOG %D/share/sgml/docbook/4.0/catalog
-@exec %D/bin/xmlcatmgr -c %D/share/sgml/catalog add CATALOG %D/share/sgml/docbook/4.1/catalog
-@exec %D/bin/xmlcatmgr -c %D/share/sgml/catalog add CATALOG %D/share/sgml/docbook/4.2/catalog
-@unexec %D/bin/xmlcatmgr -c %D/share/sgml/catalog remove %D/share/sgml/docbook/4.2/catalog
-@unexec %D/bin/xmlcatmgr -c %D/share/sgml/catalog remove %D/share/sgml/docbook/4.1/catalog
-@unexec %D/bin/xmlcatmgr -c %D/share/sgml/catalog remove %D/share/sgml/docbook/4.0/catalog
-@unexec %D/bin/xmlcatmgr -c %D/share/sgml/catalog remove %D/share/sgml/docbook/3.1/catalog
-@unexec %D/bin/xmlcatmgr -c %D/share/sgml/catalog remove %D/share/sgml/docbook/3.0/catalog
-@unexec %D/bin/xmlcatmgr -c %D/share/sgml/catalog remove %D/share/sgml/docbook/2.4.1/catalog
 @dirrm share/sgml/docbook/4.2
 @dirrm share/sgml/docbook/4.1
 @dirrm share/sgml/docbook/4.0
diff --git a/textproc/html/Makefile b/textproc/html/Makefile
index b69b1fa16c1..51861a17baf 100644
--- a/textproc/html/Makefile
+++ b/textproc/html/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/01/11 22:10:58 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/29 21:15:08 jmmv Exp $
 #
 
 DISTNAME=	html-4.0b
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://fallout.campusview.indiana.edu/ports/distfiles/
 
@@ -21,12 +21,12 @@ WRKSRC=		${WRKDIR}
 INSTDIR=        ${PREFIX}/share/sgml/html
 ISOCAT=		${PREFIX}/share/sgml/iso8879/catalog
 
+SGML_CATALOGS=	${INSTDIR}/catalog
+
 do-install:
 	${INSTALL_DATA_DIR} ${INSTDIR}
 	${GTAR} -plzx -C ${INSTDIR} -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
 	${ECHO} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/catalog
-	${PREFIX}/bin/xmlcatmgr -c ${PREFIX}/share/sgml/catalog add \
-		CATALOG ${INSTDIR}/catalog
 
-.include "../../textproc/xmlcatmgr/buildlink2.mk"
+.include "../../textproc/xmlcatmgr/catalogs.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/html/PLIST b/textproc/html/PLIST
index de70f57332d..b65e93ee50e 100644
--- a/textproc/html/PLIST
+++ b/textproc/html/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/01/11 22:10:58 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/01/29 21:15:08 jmmv Exp $
 share/sgml/html/2.0/ISOlat1.sgml
 share/sgml/html/2.0/html-1.dtd
 share/sgml/html/2.0/html-1s.dtd
@@ -16,8 +16,6 @@ share/sgml/html/4.0/frameset.dtd
 share/sgml/html/4.0/loose.dtd
 share/sgml/html/4.0/strict.dtd
 share/sgml/html/catalog
-@exec %D/bin/xmlcatmgr -c %D/share/sgml/catalog add CATALOG %D/share/sgml/html/catalog
-@unexec %D/bin/xmlcatmgr -c %D/share/sgml/catalog remove %D/share/sgml/html/catalog
 @dirrm share/sgml/html/4.0
 @dirrm share/sgml/html/3.2
 @dirrm share/sgml/html/2.0
diff --git a/textproc/iso12083/Makefile b/textproc/iso12083/Makefile
index 354ff874ce7..36baaec85f9 100644
--- a/textproc/iso12083/Makefile
+++ b/textproc/iso12083/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2003/01/11 22:06:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2003/01/29 21:15:08 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/06/27 05:19:39 asami Exp
 #
 
 DISTNAME=	iso12083-1993
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://info.ex.ac.uk/pub/SGML/ISO-12083/ \
 		ftp://ftp.ifi.uio.no/pub/SGML/ISO12083/ \
@@ -24,6 +24,8 @@ USE_BUILDLINK2=	yes
 
 INSTDIR=	${PREFIX}/share/sgml/iso12083
 
+SGML_CATALOGS=	${INSTDIR}/catalog
+
 pre-install:
 	${INSTALL_DATA_DIR} ${INSTDIR}
 
@@ -32,8 +34,6 @@ 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 "../../textproc/xmlcatmgr/catalogs.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/iso12083/PLIST b/textproc/iso12083/PLIST
index 9c129d07e5f..bad0e3584d1 100644
--- a/textproc/iso12083/PLIST
+++ b/textproc/iso12083/PLIST
@@ -1,10 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2003/01/11 22:06:44 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/01/29 21:15:08 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
 @comment in xmlcatmgr: @dirrm share/sgml
diff --git a/textproc/iso8879/Makefile b/textproc/iso8879/Makefile
index 9cf4f27132f..c5a6d7cb0db 100644
--- a/textproc/iso8879/Makefile
+++ b/textproc/iso8879/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2003/01/11 22:07:17 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2003/01/29 21:15:07 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.9 1999/02/11 16:01:16 jfieber Exp
 #
 
 DISTNAME=	isoENTS
 PKGNAME=	iso8879-1986
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://fallout.campusview.indiana.edu/ports/distfiles/
 EXTRACT_SUFX=	.zip
@@ -21,6 +21,8 @@ WRKSRC=		${WRKDIR}
 
 INSTDIR=	${PREFIX}/share/sgml/iso8879
 
+SGML_CATALOGS=	${INSTDIR}/catalog
+
 pre-install:
 	${INSTALL_DATA_DIR} ${INSTDIR}
 
@@ -29,8 +31,6 @@ 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 "../../textproc/xmlcatmgr/catalogs.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/iso8879/PLIST b/textproc/iso8879/PLIST
index aeea38ab264..e32ff65c99d 100644
--- a/textproc/iso8879/PLIST
+++ b/textproc/iso8879/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/01/11 22:07:17 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/01/29 21:15:07 jmmv Exp $
 share/sgml/iso8879/ISOamsa
 share/sgml/iso8879/ISOamsb
 share/sgml/iso8879/ISOamsc
@@ -19,7 +19,5 @@ 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
 @comment in xmlcatmgr: @dirrm share/sgml