[pkgsrc/trunk]: pkgsrc/textproc/xmlcatmgr Update to 2.0alpha1. This is the f...

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a4c63ef071db
branches:  trunk
changeset: 465184:a4c63ef071db
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Tue Dec 23 11:45:05 2003 +0000

description:
Update to 2.0alpha1.  This is the first version of the development branch.
I'm updating the package to this version because it should fix many
portability issues (avoiding the installation of GNU tools), and because
it is a lot safer when modifying existing catalog files (not line oriented
any more and with real file locking).

I've tested the program under several other systems and platforms (including
FreeBSD, Linux and Solaris, the later with the sunpro compiler too), and it
built and worked fine.  Thanks to simonb@ for testing under an Alpha system
with pkgsrc.

Change log follows:

Released on 2003/12/23, its state was alpha.

* xmlcatmgr has been completely rewritten in C.  Even though, command line
  compatibility has been kept, so that existing scripts using this program
  do not break.

* Buildtool is not used any more.  A custom build infrastructure has been
  implemented, as something small and very portable was needed.

* Added the `lookup' action, used to search for entries in catalogs.

* Added real parsers to manipulate SGML and XML catalogs.  The program is
  not line oriented any more, thus beeing a lot more flexible.

* Multiple race conditions fixed, which were unavoidable from a shell
  script.

* Better handling of special characters and spaces in strings, difficult
  to handle from shell scripts.

diffstat:

 textproc/xmlcatmgr/Makefile |  37 +++++++++++++++++++------------------
 textproc/xmlcatmgr/PLIST    |   3 ++-
 textproc/xmlcatmgr/distinfo |   6 +++---
 3 files changed, 24 insertions(+), 22 deletions(-)

diffs (94 lines):

diff -r 63d96a505d32 -r a4c63ef071db textproc/xmlcatmgr/Makefile
--- a/textproc/xmlcatmgr/Makefile       Tue Dec 23 11:14:20 2003 +0000
+++ b/textproc/xmlcatmgr/Makefile       Tue Dec 23 11:45:05 2003 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2003/12/16 22:45:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2003/12/23 11:45:05 jmmv Exp $
 #
 
-DISTNAME=      xmlcatmgr-1.2
+DISTNAME=      xmlcatmgr-2.0alpha1
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=xmlcatmgr/}
 
@@ -9,19 +9,17 @@
 HOMEPAGE=      http://xmlcatmgr.sourceforge.net/
 COMMENT=       XML (and SGML) catalog manager
 
+HAS_CONFIGURE= YES
 USE_BUILDLINK2=        YES
 USE_PKGINSTALL=        YES
-USE_GNU_TOOLS= awk
 
-MAKEFILE=      Makefile.boot
-MAKE_ENV+=     BT_PREFIX="${PREFIX}"
-MAKE_ENV+=     BT_PROG_AWK="${AWK}"
-MAKE_ENV+=     BT_PROG_GREP="${GREP}"
-MAKE_ENV+=     BT_PROG_SH="${SH}"
-MAKE_ENV+=     BT_DIR_CATALOG="${PKG_SYSCONFDIR}/xml"
-MAKE_ENV+=     BT_INSTALL_DIR="${INSTALL_DATA_DIR}"
-MAKE_ENV+=     BT_INSTALL_BIN="${INSTALL_SCRIPT}"
-MAKE_ENV+=     BT_INSTALL_DATA="${INSTALL_DATA}"
+CONFIGURE_ARGS+=       -p ${PREFIX}
+CONFIGURE_ARGS+=       -c ${PKG_SYSCONFDIR}/xml/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
 
 OWN_DIRS=      ${PKG_SYSCONFDIR}/sgml ${PKG_SYSCONFDIR}/xml
 EGDIR=         ${PREFIX}/share/examples/xmlcatmgr
@@ -31,16 +29,19 @@
 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
+
 post-build:
        @${ECHO} "Creating SGML catalogs..."
-       @${WRKSRC}/bin/xmlcatmgr.sh -sc ${WRKDIR}/catalog.etc.sgml create
-       @${WRKSRC}/bin/xmlcatmgr.sh -sc ${WRKDIR}/catalog.sgml create
-       @${WRKSRC}/bin/xmlcatmgr.sh -sc ${WRKDIR}/catalog.etc.sgml add \
+       @${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 \
                CATALOG ${PREFIX}/share/sgml/catalog
        @${ECHO} "Creating XML catalogs..."
-       @${WRKSRC}/bin/xmlcatmgr.sh -c ${WRKDIR}/catalog.etc.xml create
-       @${WRKSRC}/bin/xmlcatmgr.sh -c ${WRKDIR}/catalog.xml create
-       @${WRKSRC}/bin/xmlcatmgr.sh -c ${WRKDIR}/catalog.etc.xml add \
+       @${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 \
                nextCatalog ${PREFIX}/share/xml/catalog
 
 post-install:
diff -r 63d96a505d32 -r a4c63ef071db textproc/xmlcatmgr/PLIST
--- a/textproc/xmlcatmgr/PLIST  Tue Dec 23 11:14:20 2003 +0000
+++ b/textproc/xmlcatmgr/PLIST  Tue Dec 23 11:45:05 2003 +0000
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.5 2003/10/13 12:12:57 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/12/23 11:45:05 jmmv Exp $
 bin/xmlcatmgr
 man/man1/xmlcatmgr.1
 share/doc/${PKGNAME}/CHANGES
 share/doc/${PKGNAME}/COPYING
 share/doc/${PKGNAME}/PEOPLE
 share/doc/${PKGNAME}/README
+share/doc/${PKGNAME}/TODO
 share/examples/xmlcatmgr/catalog.etc.sgml
 share/examples/xmlcatmgr/catalog.etc.xml
 share/examples/xmlcatmgr/catalog.share.sgml
diff -r 63d96a505d32 -r a4c63ef071db textproc/xmlcatmgr/distinfo
--- a/textproc/xmlcatmgr/distinfo       Tue Dec 23 11:14:20 2003 +0000
+++ b/textproc/xmlcatmgr/distinfo       Tue Dec 23 11:45:05 2003 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2003/12/16 22:45:33 jmmv Exp $
+$NetBSD: distinfo,v 1.7 2003/12/23 11:45:05 jmmv Exp $
 
-SHA1 (xmlcatmgr-1.2.tar.gz) = 2d59d667163ef8488825e89c954e97eb6c2a6bb0
-Size (xmlcatmgr-1.2.tar.gz) = 8448 bytes
+SHA1 (xmlcatmgr-2.0alpha1.tar.gz) = ad6f449cdfbb217abed6f0bdf63f1e02e3a09262
+Size (xmlcatmgr-2.0alpha1.tar.gz) = 21392 bytes