Update to 2.2:

Third stable version of the 2.x branch, released on 2004/09/01.

* Converted to use the GNU Build System (GNU Automake and GNU Autoconf).

* Because of the previous change, the build has been hopefully fixed in
  several platforms, specially under Irix 6.5 using the MIPSpro C compiler.

3 files changed, 17 insertions, 31 deletions

diff --git a/textproc/xmlcatmgr/Makefile b/textproc/xmlcatmgr/Makefile
index 561e41b84c0..74a7e157ebb 100644
--- a/textproc/xmlcatmgr/Makefile
+++ b/textproc/xmlcatmgr/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2004/07/04 08:43:03 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2004/09/01 09:43:16 jmmv Exp $
 #
 
-DISTNAME=	xmlcatmgr-2.1
+DISTNAME=	xmlcatmgr-2.2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xmlcatmgr/}
 
@@ -11,18 +11,11 @@ COMMENT=	XML and SGML catalog manager
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-HAS_CONFIGURE=	YES
+GNU_CONFIGURE=	YES
 USE_BUILDLINK3=	YES
 USE_PKGINSTALL=	YES
 
-CONFIGURE_ARGS+=	-p ${PREFIX}
-CONFIGURE_ARGS+=	-c ${PKG_SYSCONFDIR}/xml/catalog
-CONFIGURE_ARGS+=	-C ${PKG_SYSCONFDIR}/sgml/catalog
-CONFIGURE_ENV+=		SED="${SED}"
-CONFIGURE_ENV+=		INSTALL_DATA="${INSTALL_DATA}"
-CONFIGURE_ENV+=		INSTALL_DIR="${INSTALL_DATA_DIR}"
-CONFIGURE_ENV+=		INSTALL_PROGRAM="${INSTALL_PROGRAM}"
-CONFIGURE_SCRIPT=	${WRKSRC}/configure.sh
+CONFIGURE_ARGS=	--sysconfdir=${PKG_SYSCONFDIR}
 
 OWN_DIRS=	${PKG_SYSCONFDIR}/sgml ${PKG_SYSCONFDIR}/xml
 EGDIR=		${PREFIX}/share/examples/xmlcatmgr
@@ -32,25 +25,18 @@ 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
 
-BUILD_DIRS=	${WRKSRC}/work
-INSTALL_DIRS=	${WRKSRC}/work
-
-.include "../../mk/compiler.mk"
-
-.if !empty(CC_VERSION:MMIPSpro)
-CFLAGS+=	-c99
-.endif
+PRINT_PLIST_AWK+=	/^@dirrm share\/(sgml|xml)$$/ { next; }
 
 post-build:
 	@${ECHO} "Creating SGML catalogs..."
-	@${WRKSRC}/work/xmlcatmgr -sc ${WRKDIR}/catalog.etc.sgml create
-	@${WRKSRC}/work/xmlcatmgr -sc ${WRKDIR}/catalog.sgml create
-	@${WRKSRC}/work/xmlcatmgr -sc ${WRKDIR}/catalog.etc.sgml add \
+	@${WRKSRC}/xmlcatmgr -sc ${WRKDIR}/catalog.etc.sgml create
+	@${WRKSRC}/xmlcatmgr -sc ${WRKDIR}/catalog.sgml create
+	@${WRKSRC}/xmlcatmgr -sc ${WRKDIR}/catalog.etc.sgml add \
 		CATALOG ${PREFIX}/share/sgml/catalog
 	@${ECHO} "Creating XML catalogs..."
-	@${WRKSRC}/work/xmlcatmgr -c ${WRKDIR}/catalog.etc.xml create
-	@${WRKSRC}/work/xmlcatmgr -c ${WRKDIR}/catalog.xml create
-	@${WRKSRC}/work/xmlcatmgr -c ${WRKDIR}/catalog.etc.xml add \
+	@${WRKSRC}/xmlcatmgr -c ${WRKDIR}/catalog.etc.xml create
+	@${WRKSRC}/xmlcatmgr -c ${WRKDIR}/catalog.xml create
+	@${WRKSRC}/xmlcatmgr -c ${WRKDIR}/catalog.etc.xml add \
 		nextCatalog ${PREFIX}/share/xml/catalog
 
 post-install:
diff --git a/textproc/xmlcatmgr/PLIST b/textproc/xmlcatmgr/PLIST
index fe14a277ea7..a201917edc0 100644
--- a/textproc/xmlcatmgr/PLIST
+++ b/textproc/xmlcatmgr/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.7 2004/05/02 10:29:21 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/09/01 09:43:16 jmmv Exp $
 bin/xmlcatmgr
 man/man1/xmlcatmgr.1
-share/doc/xmlcatmgr/CHANGES
+share/doc/xmlcatmgr/AUTHORS
 share/doc/xmlcatmgr/COPYING
-share/doc/xmlcatmgr/PEOPLE
+share/doc/xmlcatmgr/NEWS
 share/doc/xmlcatmgr/README
 share/doc/xmlcatmgr/TODO
 share/examples/xmlcatmgr/catalog.etc.sgml
diff --git a/textproc/xmlcatmgr/distinfo b/textproc/xmlcatmgr/distinfo
index 83027236be2..ef79ff795cd 100644
--- a/textproc/xmlcatmgr/distinfo
+++ b/textproc/xmlcatmgr/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2004/05/02 10:29:21 jmmv Exp $
+$NetBSD: distinfo,v 1.12 2004/09/01 09:43:16 jmmv Exp $
 
-SHA1 (xmlcatmgr-2.1.tar.gz) = bf68945c62deed16e4da16861fbdd9af3a0cdb63
-Size (xmlcatmgr-2.1.tar.gz) = 28716 bytes
+SHA1 (xmlcatmgr-2.2.tar.gz) = 1761eb72234a14d3d919ce3ccb0c0550421bf2e8
+Size (xmlcatmgr-2.2.tar.gz) = 97265 bytes