Update to 2.0beta1:

Released on 2004/01/23, its state was beta.

* Recognize two default catalog files, one for XML and one for SGML,
  instead of only one as in previous versions.

* Added the `-h' option to xmlcatmgr, which shows a descriptive usage
  message.

* Added multiple comments to the code, explaining what each function does.

* Some bug fixes.

The version in the buildlink2.mk file is bumped because there were some
incompatible changes done in the previous version that may cause problems
to people upgrading an already installed package.  This should have really
happened in the previous version... but well, as this is now beta, there
shouldn't be any interface changes any more.

4 files changed, 14 insertions, 11 deletions

diff --git a/textproc/xmlcatmgr/MESSAGE b/textproc/xmlcatmgr/MESSAGE
index 48306ec6532..7e5e088b652 100644
--- a/textproc/xmlcatmgr/MESSAGE
+++ b/textproc/xmlcatmgr/MESSAGE
@@ -1,15 +1,17 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2003/09/08 12:26:20 jmmv Exp $
+$NetBSD: MESSAGE,v 1.5 2004/01/23 17:12:16 jmmv Exp $
 
 The following catalogs have been installed:
 
 	* ${PKG_SYSCONFDIR}/sgml/catalog
 	  System wide SGML catalog.  Can be edited by the administrator and
-	  is not changed by packages.
+	  is not changed by packages.  This is the *default* catalog when
+	  working in SGML mode.
 
 	* ${PKG_SYSCONFDIR}/xml/catalog
 	  System wide XML catalog.  Can be edited by the administrator and
-	  is not changed by packages.  This is the *default* catalog.
+	  is not changed by packages.  This is the *default* catalog when
+	  working in XML mode.
 
 	* ${PREFIX}/share/sgml/catalog
 	  Handles SGML stuff installed under ${PREFIX}/share/sgml.
diff --git a/textproc/xmlcatmgr/Makefile b/textproc/xmlcatmgr/Makefile
index 058d1f0ef7a..71f8fa008b8 100644
--- a/textproc/xmlcatmgr/Makefile
+++ b/textproc/xmlcatmgr/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.16 2004/01/17 16:00:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/23 17:12:16 jmmv Exp $
 #
 
-DISTNAME=	xmlcatmgr-2.0alpha2
+DISTNAME=	xmlcatmgr-2.0beta1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xmlcatmgr/}
 
 MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://xmlcatmgr.sourceforge.net/
-COMMENT=	XML (and SGML) catalog manager
+COMMENT=	XML and SGML catalog manager
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
@@ -17,6 +17,7 @@ USE_PKGINSTALL=	YES
 
 CONFIGURE_ARGS+=	-p ${PREFIX}
 CONFIGURE_ARGS+=	-c ${PKG_SYSCONFDIR}/xml/catalog
+CONFIGURE_ARGS+=	-C ${PKG_SYSCONFDIR}/sgml/catalog
 CONFIGURE_ARGS+=	-D
 CONFIGURE_ENV+=		SED="${SED}"
 CONFIGURE_ENV+=		INSTALL_DATA="${INSTALL_DATA}"
diff --git a/textproc/xmlcatmgr/buildlink2.mk b/textproc/xmlcatmgr/buildlink2.mk
index a76e0a53b7d..0e177803b7f 100644
--- a/textproc/xmlcatmgr/buildlink2.mk
+++ b/textproc/xmlcatmgr/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2004/01/07 02:21:17 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2004/01/23 17:12:16 jmmv Exp $
 #
 # This Makefile fragment is included by packages that use xmlcatmgr.
 #
@@ -16,7 +16,7 @@
 XMLCATMGR_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xmlcatmgr
-BUILDLINK_DEPENDS.xmlcatmgr?=		xmlcatmgr>=0.2
+BUILDLINK_DEPENDS.xmlcatmgr?=		xmlcatmgr>=2.0beta1
 BUILDLINK_PKGSRCDIR.xmlcatmgr?=		../../textproc/xmlcatmgr
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xmlcatmgr=xmlcatmgr
diff --git a/textproc/xmlcatmgr/distinfo b/textproc/xmlcatmgr/distinfo
index 05edf01b8df..0c21eeefb64 100644
--- a/textproc/xmlcatmgr/distinfo
+++ b/textproc/xmlcatmgr/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2004/01/17 16:00:20 jmmv Exp $
+$NetBSD: distinfo,v 1.9 2004/01/23 17:12:16 jmmv Exp $
 
-SHA1 (xmlcatmgr-2.0alpha2.tar.gz) = cb23ae6e32f138dd3b3fb60d905380713ad6272c
-Size (xmlcatmgr-2.0alpha2.tar.gz) = 22647 bytes
+SHA1 (xmlcatmgr-2.0beta1.tar.gz) = 4037e811b6b8ef1c7d6893208c432df5bae87738
+Size (xmlcatmgr-2.0beta1.tar.gz) = 27584 bytes