From 3b91b79b23b275b0d17c1049295a3df10346ae4c Mon Sep 17 00:00:00 2001
From: jmmv <jmmv>
Date: Wed, 29 Jan 2003 21:38:48 +0000
Subject: Use textproc/xmlcatmgr/catalogs.mk to register the installed catalog,
 with the SGML_CATALOGS variable.  Bump PKGREVISION.

---
 textproc/jade/Makefile | 12 +++++-------
 textproc/jade/PLIST    |  4 +---
 2 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'textproc/jade')

diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile
index dd452c97ab1..8b71d036ea7 100644
--- a/textproc/jade/Makefile
+++ b/textproc/jade/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2003/01/11 23:57:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.25 2003/01/29 21:38:48 jmmv Exp $
 
 DISTNAME=	jade-1.2.1
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.jclark.com/pub/jade/ \
 		ftp://ftp.funet.fi/pub/mirrors/ftp.jclark.com/pub/jade/ \
@@ -23,9 +23,9 @@ GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/config/ltconfig
 
-JADE_CATALOG_DIR=	${PREFIX}/share/sgml/jade/catalog
+SGML_CATALOGS=		${PREFIX}/share/sgml/jade/catalog
 
-CONFIGURE_ARGS=		--enable-default-catalog=${JADE_CATALOG_DIR}
+CONFIGURE_ARGS=		--enable-default-catalog=${PREFIX}/share/sgml/jade/catalog
 CONFIGURE_ARGS+=	--enable-mif
 
 CXXFLAGS+=		${CFLAGS}
@@ -46,13 +46,11 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/jadedoc/*.htm ${PREFIX}/share/doc/jade
 	${INSTALL_DATA_DIR} ${PREFIX}/share/sgml/jade
 	${INSTALL_DATA} ${WRKSRC}/dsssl/* ${PREFIX}/share/sgml/jade
-	${PREFIX}/bin/xmlcatmgr -c ${PREFIX}/share/sgml/catalog add \
-		CATALOG ${PREFIX}/share/sgml/jade/catalog
 # Installed by print/tex-jadetex
 	${RM} ${PREFIX}/share/sgml/jade/*jadetex.*
 
 .include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../textproc/xmlcatmgr/buildlink2.mk"
+.include "../../textproc/xmlcatmgr/catalogs.mk"
 .include "../../mk/bsd.pkg.mk"
 
 # Turn off C++ optimization as there seem to be problems with the generated
diff --git a/textproc/jade/PLIST b/textproc/jade/PLIST
index ba05b0b2861..31070a3d260 100644
--- a/textproc/jade/PLIST
+++ b/textproc/jade/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/01/11 23:57:01 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/01/29 21:38:48 jmmv Exp $
 bin/jade
 bin/nsgmls
 bin/sgmlnorm
@@ -175,8 +175,6 @@ share/sgml/jade/demoMaster.tex
 share/sgml/jade/dsssl.dtd
 share/sgml/jade/fot.dtd
 share/sgml/jade/style-sheet.dtd
-@exec %D/bin/xmlcatmgr -c %D/share/sgml/catalog add CATALOG %D/share/sgml/jade/catalog
-@unexec %D/bin/xmlcatmgr -c %D/share/sgml/catalog remove %D/share/sgml/jade/catalog
 @dirrm share/sgml/jade
 @comment in xmlcatmgr: @dirrm share/sgml
 @dirrm share/doc/jade
-- 
cgit v1.2.3