Update for GNU texinfo 4.2.

3 files changed, 107 insertions, 140 deletions

diff --git a/contrib/texinfo/FREEBSD-Xlist b/contrib/texinfo/FREEBSD-Xlist
index b63863e..9263638 100644
--- a/contrib/texinfo/FREEBSD-Xlist
+++ b/contrib/texinfo/FREEBSD-Xlist
@@ -1,7 +1,7 @@
+$FreeBSD$
 */ABOUT-NLS
 */Makefile.am
 */Makefile.in
-*/acconfig.h
 */acinclude.m4
 */aclocal.m4
 */config.guess
@@ -34,7 +34,6 @@
 */missing
 */mkinstalldirs
 */po/*
-*/stamp-h.in
 */util/*awk
 */util/deref.c
 */util/fix*
diff --git a/contrib/texinfo/FREEBSD-upgrade b/contrib/texinfo/FREEBSD-upgrade
index 2900241..0769235 100644
--- a/contrib/texinfo/FREEBSD-upgrade
+++ b/contrib/texinfo/FREEBSD-upgrade
@@ -1,27 +1,27 @@
 # ex:ts=8
 $FreeBSD$
 
-GNU Texinfo 4.1
+GNU Texinfo 4.2
 	originals can be found at: ftp://ftp.gnu.org/gnu/texinfo/
 
 
 For the import of Texinfo many files and directories were pruned by:
 
-	tar -X FREEBSD-Xlist -xzf texinfo-4.1.tar.gz
+	tar -X FREEBSD-Xlist -xzf texinfo-4.2.tar.gz
 
 
 To reduce the size of import, and to make it so the changes from 3.12
-to 4.1 are easy to determine, the 4.1 directory structure was munged
+to 4.2 are easy to determine, the 4.2 directory structure was munged
 before import:
 
-	cd texinfo-4.1
+	cd texinfo-4.2
 	mv config.in config.h.in
 
 
 Then imported by:
 
-	cvs import -m 'Import of stripped down GNU texinfo 4.1' \
-		src/contrib/texinfo FSF v4_1
+	cvs import -m 'Import of stripped down GNU texinfo 4.2' \
+		src/contrib/texinfo FSF v4_2
 
 After the import, a separate extraction of texinfo was GNU configured
 in the "normal" way.  The resulting config.h file should be compared
@@ -35,4 +35,4 @@ All local changes should be submitted to the FSF for inclusion in the
 next vendor release.
 
 ru@FreeBSD.org
-17-Jan-2000
+22-Jul-2002
diff --git a/contrib/texinfo/config.h b/contrib/texinfo/config.h
index 26b6ce6..abe2ec4 100644
--- a/contrib/texinfo/config.h
+++ b/contrib/texinfo/config.h
@@ -1,75 +1,33 @@
 /* $FreeBSD$ */
-/* config.h.  Generated automatically by configure.  */
-/* config.in.  Generated automatically from configure.ac by autoheader.  */
-/* acconfig.h
-   This file is in the public domain.
-   $Id: acconfig.h,v 1.3 1998/12/06 22:04:03 karl Exp $
-
-   Descriptive text for the C preprocessor macros that
-   the distributed Autoconf macros can define.
-   No software package will use all of them; autoheader copies the ones
-   your configure.in uses into your configuration header file templates.
-
-   The entries are in sort -df order: alphabetical, case insensitive,
-   ignoring punctuation (such as underscores).  Although this order
-   can split up related entries, it makes it easier to check whether
-   a given entry is in the file.
-
-   Leave the following blank line there!!  Autoheader needs it.  */
-
-
-
-
-/* Define to 1 if including sys/ioctl.h is needed to get TIOCGWINSZ. */
-/* #undef GWINSZ_IN_SYS_IOCTL */
-
-/* Define to 1 if NLS is requested.  */
-/* #undef ENABLE_NLS */
-
-/* Define as 1 if you have catgets and don't want to use GNU gettext.  */
-/* #undef HAVE_CATGETS */
-
-/* Define as 1 if you have gettext and don't want to use GNU gettext.  */
-/* #undef HAVE_GETTEXT */
-
-/* Define if your locale.h file contains LC_MESSAGES.  */
-#define HAVE_LC_MESSAGES 1
-
-/* Define as 1 if you have the stpcpy function.  */
-/* #undef HAVE_STPCPY */
-
-/* Define to the name of the distribution.  */
-#define PACKAGE "texinfo"
-
-/* Define to the version of the distribution.  */
-#define VERSION "4.1"
-
+/* config.h.  Generated by configure.  */
+/* config.in.  Generated from configure.ac by autoheader.  */
 
 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
    systems. This function is required for `alloca.c' support on those systems.
    */
 /* #undef CRAY_STACKSEG_END */
 
-/* Define if using `alloca.c'. */
+/* Define to 1 if using `alloca.c'. */
 /* #undef C_ALLOCA */
 
 /* Define to 1 if translation of program messages to the user's native
    language is requested. */
 /* #undef ENABLE_NLS */
 
-/* Define if `TIOCGWINSZ' requires <sys/ioctl.h> */
+/* Define to 1 if `TIOCGWINSZ' requires <sys/ioctl.h>. */
 /* #undef GWINSZ_IN_SYS_IOCTL */
 
-/* Define if you have `alloca', as a function or macro. */
+/* Define to 1 if you have `alloca', as a function or macro. */
 #define HAVE_ALLOCA 1
 
-/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
+   */
 /* #undef HAVE_ALLOCA_H */
 
-/* Define if you have the <argz.h> header file. */
+/* Define to 1 if you have the <argz.h> header file. */
 /* #undef HAVE_ARGZ_H */
 
-/* Define if you have the `bzero' function. */
+/* Define to 1 if you have the `bzero' function. */
 #define HAVE_BZERO 1
 
 /* Define if the GNU dcgettext() function is already present or preinstalled.
@@ -88,49 +46,49 @@
 /* Define if this function is declared. */
 #define HAVE_DECL_STRNCASECMP 1
 
-/* Define if you don't have `vprintf' but do have `_doprnt.' */
+/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
 /* #undef HAVE_DOPRNT */
 
-/* Define if you have the <fcntl.h> header file. */
+/* Define to 1 if you have the <fcntl.h> header file. */
 #define HAVE_FCNTL_H 1
 
-/* Define if you have the `feof_unlocked' function. */
+/* Define to 1 if you have the `feof_unlocked' function. */
 /* #undef HAVE_FEOF_UNLOCKED */
 
-/* Define if you have the `fgets_unlocked' function. */
+/* Define to 1 if you have the `fgets_unlocked' function. */
 /* #undef HAVE_FGETS_UNLOCKED */
 
-/* Define if you have the `getcwd' function. */
+/* Define to 1 if you have the `getcwd' function. */
 #define HAVE_GETCWD 1
 
-/* Define if you have the `getc_unlocked' function. */
+/* Define to 1 if you have the `getc_unlocked' function. */
 /* #undef HAVE_GETC_UNLOCKED */
 
-/* Define if you have the `getegid' function. */
+/* Define to 1 if you have the `getegid' function. */
 #define HAVE_GETEGID 1
 
-/* Define if you have the `geteuid' function. */
+/* Define to 1 if you have the `geteuid' function. */
 #define HAVE_GETEUID 1
 
-/* Define if you have the `getgid' function. */
+/* Define to 1 if you have the `getgid' function. */
 #define HAVE_GETGID 1
 
-/* Define if you have the `getpagesize' function. */
+/* Define to 1 if you have the `getpagesize' function. */
 #define HAVE_GETPAGESIZE 1
 
 /* Define if the GNU gettext() function is already present or preinstalled. */
 /* #undef HAVE_GETTEXT */
 
-/* Define if you have the `getuid' function. */
+/* Define to 1 if you have the `getuid' function. */
 #define HAVE_GETUID 1
 
 /* Define if you have the iconv() function. */
 /* #undef HAVE_ICONV */
 
-/* Define if you have the <inttypes.h> header file. */
+/* Define to 1 if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H 1
 
-/* Define if you have the <io.h> header file. */
+/* Define to 1 if you have the <io.h> header file. */
 /* #undef HAVE_IO_H */
 
 /* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
@@ -139,157 +97,158 @@
 /* Define if your <locale.h> file defines LC_MESSAGES. */
 #define HAVE_LC_MESSAGES 1
 
-/* Define if you have the `bsd' library (-lbsd). */
+/* Define to 1 if you have the `bsd' library (-lbsd). */
 /* #undef HAVE_LIBBSD */
 
-/* Define if you have the <limits.h> header file. */
+/* Define to 1 if you have the <limits.h> header file. */
 #define HAVE_LIMITS_H 1
 
-/* Define if you have the <locale.h> header file. */
+/* Define to 1 if you have the <locale.h> header file. */
 #define HAVE_LOCALE_H 1
 
-/* Define if you have the <malloc.h> header file. */
-/* #undef HAVE_MALLOC_H */
+/* Define to 1 if you have the <malloc.h> header file. */
+#define HAVE_MALLOC_H 1
 
-/* Define if you have the `memcpy' function. */
+/* Define to 1 if you have the `memcpy' function. */
 #define HAVE_MEMCPY 1
 
-/* Define if you have the `memmove' function. */
+/* Define to 1 if you have the `memmove' function. */
 #define HAVE_MEMMOVE 1
 
-/* Define if you have the <memory.h> header file. */
+/* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
 
-/* Define if you have the `mempcpy' function. */
+/* Define to 1 if you have the `mempcpy' function. */
 /* #undef HAVE_MEMPCPY */
 
-/* Define if you have the `memset' function. */
+/* Define to 1 if you have the `memset' function. */
 #define HAVE_MEMSET 1
 
-/* Define if you have a working `mmap' system call. */
+/* Define to 1 if you have a working `mmap' system call. */
 #define HAVE_MMAP 1
 
-/* Define if you have the `munmap' function. */
+/* Define to 1 if you have the `munmap' function. */
 #define HAVE_MUNMAP 1
 
-/* Define if you have the <ncurses/termcap.h> header file. */
+/* Define to 1 if you have the <ncurses/termcap.h> header file. */
 /* #undef HAVE_NCURSES_TERMCAP_H */
 
-/* Define if you have the <nl_types.h> header file. */
+/* Define to 1 if you have the <nl_types.h> header file. */
 #define HAVE_NL_TYPES_H 1
 
-/* Define if you have the `putenv' function. */
+/* Define to 1 if you have the `putenv' function. */
 #define HAVE_PUTENV 1
 
-/* Define if you have the <pwd.h> header file. */
+/* Define to 1 if you have the <pwd.h> header file. */
 #define HAVE_PWD_H 1
 
-/* Define if you have the `setenv' function. */
+/* Define to 1 if you have the `setenv' function. */
 #define HAVE_SETENV 1
 
-/* Define if you have the `setlocale' function. */
+/* Define to 1 if you have the `setlocale' function. */
 #define HAVE_SETLOCALE 1
 
-/* Define if you have the `setvbuf' function. */
+/* Define to 1 if you have the `setvbuf' function. */
 #define HAVE_SETVBUF 1
 
-/* Define if you have the `sigprocmask' function. */
+/* Define to 1 if you have the `sigprocmask' function. */
 #define HAVE_SIGPROCMASK 1
 
-/* Define if you have the `sigsetmask' function. */
+/* Define to 1 if you have the `sigsetmask' function. */
 #define HAVE_SIGSETMASK 1
 
-/* Define if you have the <stddef.h> header file. */
+/* Define to 1 if you have the <stddef.h> header file. */
 #define HAVE_STDDEF_H 1
 
-/* Define if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
+/* Define to 1 if you have the <stdint.h> header file. */
+/* #undef HAVE_STDINT_H */
 
-/* Define if you have the <stdlib.h> header file. */
+/* Define to 1 if you have the <stdlib.h> header file. */
 #define HAVE_STDLIB_H 1
 
-/* Define if you have the `stpcpy' function. */
+/* Define to 1 if you have the `stpcpy' function. */
 /* #undef HAVE_STPCPY */
 
-/* Define if you have the `strcasecmp' function. */
+/* Define to 1 if you have the `strcasecmp' function. */
 #define HAVE_STRCASECMP 1
 
-/* Define if you have the `strchr' function. */
+/* Define to 1 if you have the `strchr' function. */
 #define HAVE_STRCHR 1
 
-/* Define if you have the `strcoll' function and it is properly defined. */
+/* Define to 1 if you have the `strcoll' function and it is properly defined.
+   */
 #define HAVE_STRCOLL 1
 
-/* Define if you have the `strdup' function. */
+/* Define to 1 if you have the `strdup' function. */
 #define HAVE_STRDUP 1
 
-/* Define if you have the `strerror' function. */
+/* Define to 1 if you have the `strerror' function. */
 #define HAVE_STRERROR 1
 
-/* Define if you have the <strings.h> header file. */
+/* Define to 1 if you have the <strings.h> header file. */
 #define HAVE_STRINGS_H 1
 
-/* Define if you have the <string.h> header file. */
+/* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H 1
 
-/* Define if you have the `strncasecmp' function. */
+/* Define to 1 if you have the `strncasecmp' function. */
 #define HAVE_STRNCASECMP 1
 
-/* Define if you have the `strtoul' function. */
+/* Define to 1 if you have the `strtoul' function. */
 #define HAVE_STRTOUL 1
 
-/* Define if you have the <sys/fcntl.h> header file. */
+/* Define to 1 if you have the <sys/fcntl.h> header file. */
 #define HAVE_SYS_FCNTL_H 1
 
-/* Define if you have the <sys/file.h> header file. */
+/* Define to 1 if you have the <sys/file.h> header file. */
 #define HAVE_SYS_FILE_H 1
 
-/* Define if you have the <sys/param.h> header file. */
+/* Define to 1 if you have the <sys/param.h> header file. */
 #define HAVE_SYS_PARAM_H 1
 
-/* Define if you have the <sys/ptem.h> header file. */
+/* Define to 1 if you have the <sys/ptem.h> header file. */
 /* #undef HAVE_SYS_PTEM_H */
 
-/* Define if you have the <sys/stat.h> header file. */
+/* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
 
-/* Define if you have the <sys/time.h> header file. */
+/* Define to 1 if you have the <sys/time.h> header file. */
 #define HAVE_SYS_TIME_H 1
 
-/* Define if you have the <sys/ttold.h> header file. */
+/* Define to 1 if you have the <sys/ttold.h> header file. */
 /* #undef HAVE_SYS_TTOLD_H */
 
-/* Define if you have the <sys/types.h> header file. */
+/* Define to 1 if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H 1
 
-/* Define if you have the <sys/wait.h> header file. */
+/* Define to 1 if you have the <sys/wait.h> header file. */
 #define HAVE_SYS_WAIT_H 1
 
-/* Define if you have the <termcap.h> header file. */
+/* Define to 1 if you have the <termcap.h> header file. */
 #define HAVE_TERMCAP_H 1
 
-/* Define if you have the <termios.h> header file. */
+/* Define to 1 if you have the <termios.h> header file. */
 #define HAVE_TERMIOS_H 1
 
-/* Define if you have the <termio.h> header file. */
+/* Define to 1 if you have the <termio.h> header file. */
 /* #undef HAVE_TERMIO_H */
 
-/* Define if you have the `tsearch' function. */
+/* Define to 1 if you have the `tsearch' function. */
 #define HAVE_TSEARCH 1
 
-/* Define if you have the <unistd.h> header file. */
+/* Define to 1 if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H 1
 
-/* Define if you have the `vprintf' function. */
+/* Define to 1 if you have the `vprintf' function. */
 #define HAVE_VPRINTF 1
 
-/* Define if you have the `__argz_count' function. */
+/* Define to 1 if you have the `__argz_count' function. */
 /* #undef HAVE___ARGZ_COUNT */
 
-/* Define if you have the `__argz_next' function. */
+/* Define to 1 if you have the `__argz_next' function. */
 /* #undef HAVE___ARGZ_NEXT */
 
-/* Define if you have the `__argz_stringify' function. */
+/* Define to 1 if you have the `__argz_stringify' function. */
 /* #undef HAVE___ARGZ_STRINGIFY */
 
 /* Define as const if the declaration of iconv() needs const. */
@@ -298,6 +257,21 @@
 /* Name of package */
 #define PACKAGE "texinfo"
 
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "GNU Texinfo"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "GNU Texinfo 4.2"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "texinfo"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "4.2"
+
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void
 
@@ -309,26 +283,26 @@
         STACK_DIRECTION = 0 => direction of growth unknown */
 /* #undef STACK_DIRECTION */
 
-/* Define if the `S_IS*' macros in <sys/stat.h> do not work properly. */
+/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
 /* #undef STAT_MACROS_BROKEN */
 
-/* Define if you have the ANSI C header files. */
+/* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
-/* Define if your <sys/time.h> declares `struct tm'. */
+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */
-#define VERSION "4.1"
+#define VERSION "4.2"
 
-/* Define if on MINIX. */
+/* Define to 1 if on MINIX. */
 /* #undef _MINIX */
 
-/* Define if the system does not provide POSIX.1 features except with this
-   defined. */
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
 /* #undef _POSIX_1_SOURCE */
 
-/* Define if you need to in order for `stat' and other things to work. */
+/* Define to 1 if you need to in order for `stat' and other things to work. */
 /* #undef _POSIX_SOURCE */
 
 /* Define to empty if `const' does not conform to ANSI C. */
@@ -343,9 +317,3 @@
 
 /* Define to `unsigned' if <sys/types.h> does not define. */
 /* #undef size_t */
-
-
-/* Leave that blank line there!!  Autoheader needs it.
-   If you're adding to this file, keep in mind:
-   The entries are in sort -df order: alphabetical, case insensitive,
-   ignoring punctuation (such as underscores).  */