- Install an additional SGML catalog file under share/sgml/catalog.

- Install a system wide catalog file under PKG_SYSCONFDIR, which now
  becomes the default for the program.
- Bump PKGREVISION to 1.

4 files changed, 42 insertions, 10 deletions

diff --git a/textproc/xmlcatmgr/MESSAGE b/textproc/xmlcatmgr/MESSAGE
index c9e550c0a7a..9d868e5bc96 100644
--- a/textproc/xmlcatmgr/MESSAGE
+++ b/textproc/xmlcatmgr/MESSAGE
@@ -1,8 +1,18 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2003/01/10 19:24:48 jmmv Exp $
+$NetBSD: MESSAGE,v 1.2 2003/01/11 21:08:42 jmmv Exp $
 
-The default catalog is ${PREFIX}/share/xml/catalog.  If you will be
-using xmlcatmgr to manage catalogs from inside other packages, please do
-not manually specify it.
+The following catalogs have been installed:
+
+	* ${PKG_SYSCONFDIR}/catalog
+	  System wide catalog. This can be edited by the administrator and
+	  is not changed by packages.
+
+	* ${PREFIX}/share/sgml/catalog
+	  Handles SGML stuff installed under ${PREFIX}/share/sgml.
+	  Automatically handled by packages.
+
+	* ${PREFIX}/share/xml/catalog
+	  Handles XML stuff installed under ${PREFIX}/share/xml.
+	  Automatically handled by packages.
 
 ===========================================================================
diff --git a/textproc/xmlcatmgr/Makefile b/textproc/xmlcatmgr/Makefile
index 42bc17f0079..2064667a93c 100644
--- a/textproc/xmlcatmgr/Makefile
+++ b/textproc/xmlcatmgr/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/01/10 19:24:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/11 21:08:42 jmmv Exp $
 #
 
 DISTNAME=	xmlcatmgr-0.1
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xmlcatmgr/}
 
@@ -15,10 +16,27 @@ MAKEFILE=	Makefile.boot
 MAKE_ENV+=	BT_PREFIX="${PREFIX}"
 MAKE_ENV+=	BT_PROG_AWK="${AWK}"
 MAKE_ENV+=	BT_PROG_SH="${SH}"
-MAKE_ENV+=	BT_DIR_CATALOG="${PREFIX}/share/xml"
+MAKE_ENV+=	BT_DIR_CATALOG="${PKG_SYSCONFDIR}"
+
+EGDIR=		${PREFIX}/share/examples/xmlcatmgr
+CONF_FILES=	${EGDIR}/catalog.global ${PKG_SYSCONFDIR}/catalog
+
+post-build:
+	${WRKSRC}/bin/xmlcatmgr.sh -c ${WRKDIR}/catalog.global create
+	${WRKSRC}/bin/xmlcatmgr.sh -c ${WRKDIR}/catalog.sgml create
+	${WRKSRC}/bin/xmlcatmgr.sh -c ${WRKDIR}/catalog.xml create
+	${WRKSRC}/bin/xmlcatmgr.sh -c ${WRKDIR}/catalog.global add \
+		CATALOG ${PREFIX}/share/sgml/catalog
+	${WRKSRC}/bin/xmlcatmgr.sh -c ${WRKDIR}/catalog.global add \
+		CATALOG ${PREFIX}/share/xml/catalog
 
 post-install:
+	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_DATA_DIR} ${PREFIX}/share/sgml
 	${INSTALL_DATA_DIR} ${PREFIX}/share/xml
-	${PREFIX}/bin/xmlcatmgr create
+	${INSTALL_DATA} ${WRKDIR}/catalog.global ${EGDIR}/catalog.global
+	${INSTALL_DATA} ${WRKDIR}/catalog.sgml ${PREFIX}/share/sgml/catalog
+	${INSTALL_DATA} ${WRKDIR}/catalog.xml ${PREFIX}/share/xml/catalog
 
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xmlcatmgr/PLIST b/textproc/xmlcatmgr/PLIST
index 9db69049928..fa89f6b8edd 100644
--- a/textproc/xmlcatmgr/PLIST
+++ b/textproc/xmlcatmgr/PLIST
@@ -1,5 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/01/10 19:24:48 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/01/11 21:08:42 jmmv Exp $
 bin/xmlcatmgr
 man/man1/xmlcatmgr.1
+share/examples/xmlcatmgr/catalog.global
+share/sgml/catalog
 share/xml/catalog
 @dirrm share/xml
+@dirrm share/sgml
+@dirrm share/examples/xmlcatmgr
diff --git a/textproc/xmlcatmgr/buildlink2.mk b/textproc/xmlcatmgr/buildlink2.mk
index 8be4bdad851..799ac8ad6b1 100644
--- a/textproc/xmlcatmgr/buildlink2.mk
+++ b/textproc/xmlcatmgr/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/01/10 19:24:48 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/01/11 21:08:42 jmmv Exp $
 #
 # This Makefile fragment is included by packages that use xmlcatmgr.
 #
@@ -9,7 +9,7 @@
 XMLCATMGR_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xmlcatmgr
-BUILDLINK_DEPENDS.xmlcatmgr?=		xmlcatmgr>=0.1
+BUILDLINK_DEPENDS.xmlcatmgr?=		xmlcatmgr>=0.1nb1
 BUILDLINK_PKGSRCDIR.xmlcatmgr?=		../../textproc/xmlcatmgr
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xmlcatmgr=xmlcatmgr