Update to 1.0:

* Adapted Buildtool scripts to the latest version, 0.14.  As a side effect,
  distribution documentation is now installed into the system.
* Minor manpage fixes.
* Code cleanup.

Fixes in the package: avoid overwriting catalog files when using 'make
replace' (if you have 0.2 installed actually, it won't take any effect, so
be careful by backing up pkg/share/{sgml,xml}/catalog).  'make update' will
work fine.

6 files changed, 25 insertions, 25 deletions

diff --git a/textproc/xmlcatmgr/MESSAGE b/textproc/xmlcatmgr/MESSAGE
index 02f7d51c8e6..48306ec6532 100644
--- a/textproc/xmlcatmgr/MESSAGE
+++ b/textproc/xmlcatmgr/MESSAGE
@@ -1,15 +1,15 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2003/01/29 20:21:07 jmmv Exp $
+$NetBSD: MESSAGE,v 1.4 2003/09/08 12:26:20 jmmv Exp $
 
 The following catalogs have been installed:
 
 	* ${PKG_SYSCONFDIR}/sgml/catalog
-	  System wide SGML catalog. Can be edited by the administrator and
+	  System wide SGML catalog.  Can be edited by the administrator and
 	  is not changed by packages.
 
 	* ${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.
+	  System wide XML catalog.  Can be edited by the administrator and
+	  is not changed by packages.  This is the *default* catalog.
 
 	* ${PREFIX}/share/sgml/catalog
 	  Handles SGML stuff installed under ${PREFIX}/share/sgml.
diff --git a/textproc/xmlcatmgr/Makefile b/textproc/xmlcatmgr/Makefile
index c4d7826a4e8..154e971e579 100644
--- a/textproc/xmlcatmgr/Makefile
+++ b/textproc/xmlcatmgr/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 22:54:56 grant Exp $
+# $NetBSD: Makefile,v 1.8 2003/09/08 12:26:20 jmmv Exp $
 #
 
-DISTNAME=	xmlcatmgr-0.2
+DISTNAME=	xmlcatmgr-1.0
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xmlcatmgr/}
 
 MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://xmlcatmgr.sourceforge.net/
-COMMENT=	XML catalog manager
+COMMENT=	XML (and SGML) catalog manager
 
 USE_BUILDLINK2=	YES
 USE_PKGINSTALL=	YES
@@ -25,6 +25,9 @@ OWN_DIRS=	${PKG_SYSCONFDIR}/sgml ${PKG_SYSCONFDIR}/xml
 EGDIR=		${PREFIX}/share/examples/xmlcatmgr
 CONF_FILES=	${EGDIR}/catalog.etc.sgml ${PKG_SYSCONFDIR}/sgml/catalog
 CONF_FILES+=	${EGDIR}/catalog.etc.xml ${PKG_SYSCONFDIR}/xml/catalog
+MAKE_DIRS=	${PREFIX}/share/sgml ${PREFIX}/share/xml
+SUPPORT_FILES=	${EGDIR}/catalog.share.sgml ${PREFIX}/share/sgml/catalog
+SUPPORT_FILES+=	${EGDIR}/catalog.share.xml ${PREFIX}/share/xml/catalog
 
 post-build:
 	@${ECHO} "Creating SGML catalogs..."
@@ -40,11 +43,9 @@ post-build:
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA_DIR} ${PREFIX}/share/sgml
-	${INSTALL_DATA_DIR} ${PREFIX}/share/xml
 	${INSTALL_DATA} ${WRKDIR}/catalog.etc.sgml ${EGDIR}/catalog.etc.sgml
 	${INSTALL_DATA} ${WRKDIR}/catalog.etc.xml ${EGDIR}/catalog.etc.xml
-	${INSTALL_DATA} ${WRKDIR}/catalog.sgml ${PREFIX}/share/sgml/catalog
-	${INSTALL_DATA} ${WRKDIR}/catalog.xml ${PREFIX}/share/xml/catalog
+	${INSTALL_DATA} ${WRKDIR}/catalog.sgml ${EGDIR}/catalog.share.sgml
+	${INSTALL_DATA} ${WRKDIR}/catalog.xml ${EGDIR}/catalog.share.xml
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xmlcatmgr/PLIST b/textproc/xmlcatmgr/PLIST
index 32dd5de0913..2a568e65ee5 100644
--- a/textproc/xmlcatmgr/PLIST
+++ b/textproc/xmlcatmgr/PLIST
@@ -1,10 +1,13 @@
-@comment $NetBSD: PLIST,v 1.3 2003/01/29 20:21:07 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/09/08 12:26:21 jmmv Exp $
 bin/xmlcatmgr
 man/man1/xmlcatmgr.1
+share/doc/xmlcatmgr/CHANGES
+share/doc/xmlcatmgr/COPYING
+share/doc/xmlcatmgr/PEOPLE
+share/doc/xmlcatmgr/README
 share/examples/xmlcatmgr/catalog.etc.sgml
 share/examples/xmlcatmgr/catalog.etc.xml
-share/sgml/catalog
-share/xml/catalog
-@dirrm share/xml
-@dirrm share/sgml
+share/examples/xmlcatmgr/catalog.share.sgml
+share/examples/xmlcatmgr/catalog.share.xml
 @dirrm share/examples/xmlcatmgr
+@dirrm share/doc/xmlcatmgr
diff --git a/textproc/xmlcatmgr/distinfo b/textproc/xmlcatmgr/distinfo
index 875035c7b72..c5c431444a5 100644
--- a/textproc/xmlcatmgr/distinfo
+++ b/textproc/xmlcatmgr/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2003/01/29 20:21:07 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2003/09/08 12:26:21 jmmv Exp $
 
-SHA1 (xmlcatmgr-0.2.tar.gz) = d83cf8cf926d5f330525f118944d5502b84e8fd0
-Size (xmlcatmgr-0.2.tar.gz) = 8136 bytes
+SHA1 (xmlcatmgr-1.0.tar.gz) = a44436f9873d6985297c358adf59e02dba8567c7
+Size (xmlcatmgr-1.0.tar.gz) = 8034 bytes
diff --git a/textproc/xmlcatmgr/files/deinstall.tmpl b/textproc/xmlcatmgr/files/deinstall.tmpl
index e63e0835930..9e21d7deb19 100644
--- a/textproc/xmlcatmgr/files/deinstall.tmpl
+++ b/textproc/xmlcatmgr/files/deinstall.tmpl
@@ -1,4 +1,4 @@
-# $NetBSD: deinstall.tmpl,v 1.2 2003/03/17 17:48:06 jmmv Exp $
+# $NetBSD: deinstall.tmpl,v 1.3 2003/09/08 12:26:22 jmmv Exp $
 #
 # Unregister SGML/XML catalog entries.
 #
@@ -12,7 +12,6 @@ XML_ENTRIES='@XML_ENTRIES@'
 case ${STAGE} in
 DEINSTALL)
 	if [ -n "${SGML_ENTRIES}" ]; then
-		${ECHO} "===> Unregistering SGML catalog entries for ${PKGNAME}"
 		set -- ${SGML_ENTRIES}
 		while [ $# -gt 0 ]; do
 			${XMLCATMGR} -sc ${SGML_CATALOG} remove "$2"
@@ -20,7 +19,6 @@ DEINSTALL)
 		done
 	fi
 	if [ -n "${XML_ENTRIES}" ]; then
-		${ECHO} "===> Unregistering XML catalog entries for ${PKGNAME}"
 		set -- ${XML_ENTRIES}
 		while [ $# -gt 0 ]; do
 			${XMLCATMGR} -c ${XML_CATALOG} remove "$2"
diff --git a/textproc/xmlcatmgr/files/install.tmpl b/textproc/xmlcatmgr/files/install.tmpl
index 92ddc1e8784..bc995eb27a4 100644
--- a/textproc/xmlcatmgr/files/install.tmpl
+++ b/textproc/xmlcatmgr/files/install.tmpl
@@ -1,4 +1,4 @@
-# $NetBSD: install.tmpl,v 1.2 2003/03/17 17:48:06 jmmv Exp $
+# $NetBSD: install.tmpl,v 1.3 2003/09/08 12:26:22 jmmv Exp $
 #
 # Register SGML/XML catalog entries.
 #
@@ -12,7 +12,6 @@ XML_ENTRIES='@XML_ENTRIES@'
 case ${STAGE} in
 POST-INSTALL)
 	if [ -n "${SGML_ENTRIES}" ]; then
-		${ECHO} "===> Registering SGML catalog entries for ${PKGNAME}"
 		set -- ${SGML_ENTRIES}
 		while [ $# -gt 0 ]; do
 			${XMLCATMGR} -sc ${SGML_CATALOG} add "$1" "$2" "$3"
@@ -20,7 +19,6 @@ POST-INSTALL)
 		done
 	fi
 	if [ -n "${XML_ENTRIES}" ]; then
-		${ECHO} "===> Registering XML catalog entries for ${PKGNAME}"
 		set -- ${XML_ENTRIES}
 		while [ $# -gt 0 ]; do
 			${XMLCATMGR} -c ${XML_CATALOG} add "$1" "$2" "$3"