Update autogen to 5.8.3.

Changes since 5.6.4 includes:
* Fixed a small timing hole where the read from the read end of the output
  pipe of the server shell can fail.  (The read is retried.)
* Added a macro for testing mmap failure to accommodate a picky compiler.
* The minor version number is being bumped.  There is a new (albeit tiny)
  feature being added to the syntax.  See the doc on the pseudo-macro.
* Fixed a bug wherein out-of-order definitions could get mistyped causing
  various catastrophic results.
* Definition and license text files were mmap-ed in without checking for
  the size being a multiple of a page.  strlen() would seg fault.
  Horrible, horrible design of mmap!
* disable autoopts/test/getopt.test unless autoopts has been fully installed.
  (It requires getopt.tpl which requires a fully installed environment.)
* several other usability improvements to the tear off library.
* template shell code may now use a shell function "die" that will print
  an error message and shoot down the master autogen process.
* the tear-off/add-in libopts library will now specify that the
  "options.h" header is to be installed.
* realpath(3C) usage in libopts has been cleaned up.  It is now only used
  if PATH_MAX is defined for the platform.  canonicalize_file_name(3C) is
  used where available.

4 files changed, 161 insertions, 12 deletions

diff --git a/devel/autogen/Makefile b/devel/autogen/Makefile
index f4d9fc6a8db..7769e3c76b3 100644
--- a/devel/autogen/Makefile
+++ b/devel/autogen/Makefile
@@ -1,20 +1,22 @@
-# $NetBSD: Makefile,v 1.21 2006/03/05 16:27:24 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2006/03/09 20:45:20 kristerw Exp $
 
-DISTNAME=	autogen-5.6.4
-PKGREVISION=	1
+DISTNAME=	autogen-5.8.3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=autogen/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	kristerw@NetBSD.org
 HOMEPAGE=	http://autogen.sourceforge.net/
-COMMENT=	The Automated Program Generator
+COMMENT=	The Automated Text and Program Generation Tool
 
 USE_TOOLS+=		gmake makeinfo
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 INFO_FILES=		autogen.info
 
+pre-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/include/autoopts
+
 .include "../../lang/guile/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/autogen/PLIST b/devel/autogen/PLIST
index dd1d6866b9c..f50f08b5cda 100644
--- a/devel/autogen/PLIST
+++ b/devel/autogen/PLIST
@@ -1,28 +1,44 @@
-@comment $NetBSD: PLIST,v 1.8 2004/11/27 12:13:37 kristerw Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/03/09 20:45:20 kristerw Exp $
 bin/autogen
 bin/autoopts-config
 bin/columns
 bin/getdefs
 bin/xml2ag
-include/options.h
-include/usage-txt.h
+include/autoopts/options.h
+include/autoopts/usage-txt.h
 lib/libguileopts.la
 lib/libopts.la
+lib/pkgconfig/autoopts.pc
 man/man1/autogen.1
 man/man1/autoopts-config.1
 man/man1/columns.1
 man/man1/getdefs.1
 man/man1/xml2ag.1
+man/man3/ao_string_tokenize.3
+man/man3/configFileLoad.3
+man/man3/optionFileLoad.3
+man/man3/optionFindNextValue.3
+man/man3/optionFindValue.3
 man/man3/optionFree.3
+man/man3/optionGetValue.3
 man/man3/optionLoadLine.3
+man/man3/optionNextValue.3
 man/man3/optionProcess.3
 man/man3/optionRestore.3
 man/man3/optionSaveFile.3
 man/man3/optionSaveState.3
+man/man3/optionUnloadNested.3
 man/man3/optionVersion.3
+man/man3/strequate.3
+man/man3/streqvcmp.3
+man/man3/streqvmap.3
+man/man3/strneqvcmp.3
+man/man3/strtransform.3
 share/aclocal/autoopts.m4
+share/aclocal/liboptschk.m4
 share/autogen/aginfo.tpl
 share/autogen/aginfo3.tpl
+share/autogen/agman-lib.tpl
 share/autogen/agman1.tpl
 share/autogen/agman3.tpl
 share/autogen/autoopts.m4
@@ -32,11 +48,13 @@ share/autogen/fsm-macro.tpl
 share/autogen/fsm-trans.tpl
 share/autogen/fsm.tpl
 share/autogen/getopt.tpl
-share/autogen/libopts-23.0.14.tar.gz
+share/autogen/libopts-27.1.2.tar.gz
 share/autogen/optcode.tpl
 share/autogen/opthead.tpl
 share/autogen/options.tpl
 share/autogen/optlib.tpl
 share/autogen/optmain.tpl
+share/autogen/rc-sample.tpl
 share/autogen/stdoptions.def
 @dirrm share/autogen
+@dirrm include/autoopts
diff --git a/devel/autogen/distinfo b/devel/autogen/distinfo
index c06e9e5b016..3a7a9057848 100644
--- a/devel/autogen/distinfo
+++ b/devel/autogen/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 22:24:10 agc Exp $
+$NetBSD: distinfo,v 1.7 2006/03/09 20:45:20 kristerw Exp $
 
-SHA1 (autogen-5.6.4.tar.bz2) = b1d9e3651eb7a68bf0b8d7d533f12b12800386d0
-RMD160 (autogen-5.6.4.tar.bz2) = 12e5ed31740829c9986c62856c9f0514322ca0d5
-Size (autogen-5.6.4.tar.bz2) = 813341 bytes
+SHA1 (autogen-5.8.3.tar.bz2) = 267d381134054fe5aac61eebf4a7401eb1f8c5cd
+RMD160 (autogen-5.8.3.tar.bz2) = c55b5486336caaf937f1a05e8afe133ea9fcd140
+Size (autogen-5.8.3.tar.bz2) = 929965 bytes
+SHA1 (patch-aa) = f5477f8e09242d58f840a86447db1f2c6d7ed8db
diff --git a/devel/autogen/patches/patch-aa b/devel/autogen/patches/patch-aa
new file mode 100644
index 00000000000..043df677a13
--- /dev/null
+++ b/devel/autogen/patches/patch-aa
@@ -0,0 +1,128 @@
+$NetBSD: patch-aa,v 1.1 2006/03/09 20:45:20 kristerw Exp $
+
+--- agen5/bootstrap.dir.orig	2006-03-09 20:25:30.000000000 +0100
++++ agen5/bootstrap.dir	2006-03-09 20:28:42.000000000 +0100
+@@ -1,4 +1,4 @@
+-#! /bin/bash
++#! /bin/sh
+ #
+ # ----------------------------------------------------------------------
+ # agen5/bootstrap.dir --- maintainer's bootstrap script
+@@ -27,7 +27,7 @@
+ #  Otherwise, we are being invoked from "make".
+ #
+ case "${1}" in
+-(recursive)
++recursive)
+   top_srcdir=`cd ..;pwd`
+   top_builddir=${top_srcdir}
+   srcdir=`pwd`
+@@ -43,12 +43,12 @@
+   set -- $t
+   ;;
+ 
+-("")
++"")
+   echo "Specify what you want bootstrapped"
+   exit 1
+   ;;
+ 
+-(*)
++*)
+   builddir=`pwd`
+   top_srcdir=${top_srcdir-`cd ..;pwd`}
+   top_builddir=${top_builddir-`cd ..;pwd`}
+@@ -127,7 +127,7 @@
+ do
+   echo Re-building "$t"
+   case "$t" in
+-  ( stamp-parse    | \
++   stamp-parse    | \
+     defParse-fsm.c | \
+     defParse-fsm.h )
+     # Make the definition parser
+@@ -145,7 +145,7 @@
+     date > stamp-parse
+     ;;
+ 
+-  (stamp-opts | opts.[ch])
++  stamp-opts | opts.[ch])
+     # Make the option processing files:
+     #
+     if test -z "${AGexe}" -o -z "${CLexe}"
+@@ -159,7 +159,7 @@
+     date > stamp-opts
+     ;;
+ 
+-  (stamp-fsm)
++  stamp-fsm)
+     # Make the pseudo-macro processing Finite State Machine
+     #
+     if [ -z "${AGexe}" ]
+@@ -176,7 +176,7 @@
+     date > stamp-fsm
+     ;;
+ 
+-  ( stamp-exprini | \
++   stamp-exprini | \
+     expr.h   | \
+     expr.def | \
+     expr.ini )
+@@ -210,7 +210,7 @@
+     date > stamp-exprini
+     ;;
+ 
+-  (stamp-directive | \
++  stamp-directive | \
+     directive.def  | \
+     directive.h )
+     if test -z "${AGexe}" -o -z "${CLexe}"
+@@ -232,7 +232,7 @@
+     date > stamp-directive
+     ;;
+ 
+-  (stamp-texi | autogen.texi | autogen.menu)
++  stamp-texi | autogen.texi | autogen.menu)
+     # Construct the info doc
+     #
+     if test -z "${AGexe}" -o -z "${CLexe}"
+@@ -246,7 +246,7 @@
+     ${AGexe} ${eopt} ${srcdir}/opts.def
+     ;;
+ 
+-  (stamp-man | autogen.1)
++  stamp-man | autogen.1)
+     # Construct the man page
+     #
+     if test -z "${AGexe}" -o -z "${CLexe}"
+@@ -260,26 +260,26 @@
+     ${AGexe} ${eopt} ${srcdir}/opts.def
+     ;;
+ 
+-  (fmemopen.3)
++  fmemopen.3)
+     ${GDexe} templ=agman3.tpl linenum output=fmemopen.def fmemopen.c
+     ${AGexe} -L ${top_srcdir}/autoopts fmemopen.def
+     rm -f fmemopen.def
+     ;;
+ 
+-  (proto.h)
++  proto.h)
+     files=`allbut *.c - *fsm.c` 2>/dev/null
+     test -z "${files}" && files=`echo *.c`
+     :mkfwd -p ${files}
+     ;;
+ 
+-  (functions.h)
++  functions.h)
+     files=`fgrep -l '/*=macfunc' *.c`
+     opts='template=functions.tpl srcfile linenum defs=macfunc listattr=alias'
+     getdefs output=functions.def ${opts} ${files}
+     autogen functions.def
+     ;;
+ 
+-  (*)
++  *)
+     echo "Don't know how to make $t"
+     exit 1
+     ;;