Update for 4.7.

gnu/usr.bin/texinfo/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.17 2003/07/03 15:17:47 wiz Exp $
+#	$NetBSD: Makefile,v 1.18 2004/07/12 23:45:26 wiz Exp $
 
 .include <bsd.own.mk>
 
@@ -6,12 +6,12 @@ SUBDIR=		common .WAIT info infokey install-info makeinfo texi2dvi texindex
 
 .if ${MKSHARE} != "no"
 FILESDIR=	/usr/share/misc
-FILES=		epsf.tex texinfo.dtd texinfo.tex texinfo.xsl
+FILES=		epsf.tex texinfo.cat texinfo.dtd texinfo.tex texinfo.xsl
 .endif
 
 .if ${MKNLS} != "no"
 .for F in cs.gmo da.gmo de.gmo de_AT.gmo eo.gmo fr.gmo he.gmo hr.gmo ja.gmo \
-	nl.gmo no.gmo ro.gmo ru.gmo sv.gmo tr.gmo zh_CN.gmo zh_TW.gmo
+	nb.gmo nl.gmo no.gmo pl.gmo ro.gmo ru.gmo sv.gmo tr.gmo zh_CN.gmo zh_TW.gmo
 FILES+=		${F}
 FILESDIR_${F}=  /usr/share/locale/${F:.gmo=}/LC_MESSAGES
 FILESNAME_${F}= texinfo.mo
@@ -29,7 +29,7 @@ DIST=		${NETBSDSRCDIR}/gnu/dist
 IDIST=		${DIST}/texinfo
 INFOFLAGS=	-I${IDIST}/doc
 
-.PATH: ${IDIST} ${IDIST}/doc ${IDIST}/makeinfo ${IDIST}/po
+.PATH: ${IDIST} ${IDIST}/doc ${IDIST}/makeinfo ${IDIST}/po ${IDIST}/util
 
 .include <bsd.info.mk>
 .include <bsd.prog.mk>

gnu/usr.bin/texinfo/common/config.h

@@ -1,4 +1,4 @@
-/* $NetBSD: config.h,v 1.9 2003/09/09 12:55:10 wiz Exp $ */
+/* $NetBSD: config.h,v 1.10 2004/07/12 23:46:40 wiz Exp $ */
 /* config.h.  Generated by configure.  */
 /* config.in.  Generated from configure.ac by autoheader.  */
 
@@ -27,28 +27,51 @@
 /* Define to 1 if you have the <argz.h> header file. */
 /* #undef HAVE_ARGZ_H */
 
+/* Define to 1 if you have the `asprintf' function. */
+#define HAVE_ASPRINTF 1
+
 /* Define to 1 if you have the `bzero' function. */
 #define HAVE_BZERO 1
 
 /* Define if the GNU dcgettext() function is already present or preinstalled.
    */
-/* #undef HAVE_DCGETTEXT */
+#define HAVE_DCGETTEXT 1
+
+/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
+   don't. */
+#define HAVE_DECL_FEOF_UNLOCKED 0
+
+/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if
+   you don't. */
+#define HAVE_DECL_FGETS_UNLOCKED 0
+
+/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
+   don't. */
+#define HAVE_DECL_GETC_UNLOCKED 1
 
 /* Define to 1 if you have the declaration of `getenv', and to 0 if you don't.
    */
 #define HAVE_DECL_GETENV 1
 
-/* Define if this function is declared. */
+/* Define to 1 if you have the declaration of `memchr', and to 0 if you don't.
-#define HAVE_DECL_STRCASECMP 1
+   */
+#define HAVE_DECL_MEMCHR 1
 
-/* Define if this function is declared. */
+/* Define to 1 if you have the declaration of `strcoll', and to 0 if you
+   don't. */
 #define HAVE_DECL_STRCOLL 1
 
-/* Define if this function is declared. */
+/* Define to 1 if you have the declaration of `strerror', and to 0 if you
+   don't. */
 #define HAVE_DECL_STRERROR 1
 
-/* Define if this function is declared. */
+/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you
-#define HAVE_DECL_STRNCASECMP 1
+   don't. */
+#define HAVE_DECL__SNPRINTF 0
+
+/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you
+   don't. */
+#define HAVE_DECL__SNWPRINTF 0
 
 /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
 /* #undef HAVE_DOPRNT */
@@ -56,18 +79,12 @@
 /* Define to 1 if you have the <fcntl.h> header file. */
 #define HAVE_FCNTL_H 1
 
-/* Define to 1 if you have the `feof_unlocked' function. */
+/* Define to 1 if you have the `fwprintf' function. */
-/* #undef HAVE_FEOF_UNLOCKED */
+/* #undef HAVE_FWPRINTF */
-
-/* Define to 1 if you have the `fgets_unlocked' function. */
-/* #undef HAVE_FGETS_UNLOCKED */
 
 /* Define to 1 if you have the `getcwd' function. */
 #define HAVE_GETCWD 1
 
-/* Define to 1 if you have the `getc_unlocked' function. */
-#define HAVE_GETC_UNLOCKED 1
-
 /* Define to 1 if you have the `getegid' function. */
 #define HAVE_GETEGID 1
 
@@ -81,7 +98,7 @@
 #define HAVE_GETPAGESIZE 1
 
 /* Define if the GNU gettext() function is already present or preinstalled. */
-/* #undef HAVE_GETTEXT */
+#define HAVE_GETTEXT 1
 
 /* Define to 1 if you have the `gettimeofday' function. */
 /* #undef HAVE_GETTIMEOFDAY */
@@ -90,7 +107,10 @@
 #define HAVE_GETUID 1
 
 /* Define if you have the iconv() function. */
-/* #undef HAVE_ICONV */
+#define HAVE_ICONV 1
+
+/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
+#define HAVE_INTMAX_T 1
 
 /* Define if <inttypes.h> exists and doesn't clash with <sys/types.h>. */
 #define HAVE_INTTYPES_H 1
@@ -117,6 +137,12 @@
 /* Define to 1 if you have the <locale.h> header file. */
 #define HAVE_LOCALE_H 1
 
+/* Define if you have the 'long double' type. */
+#define HAVE_LONG_DOUBLE 1
+
+/* Define if you have the 'long long' type. */
+#define HAVE_LONG_LONG 1
+
 /* Define to 1 if you have the <malloc.h> header file. */
 #define HAVE_MALLOC_H 1
 
@@ -150,6 +176,9 @@
 /* Define to 1 if you have the <nl_types.h> header file. */
 #define HAVE_NL_TYPES_H 1
 
+/* Define if your printf() function supports format strings with positions. */
+/* #undef HAVE_POSIX_PRINTF */
+
 /* Define to 1 if you have the `putenv' function. */
 #define HAVE_PUTENV 1
 
@@ -174,6 +203,9 @@
 /* Define to 1 if you have the `sigsetmask' function. */
 #define HAVE_SIGSETMASK 1
 
+/* Define to 1 if you have the `snprintf' function. */
+#define HAVE_SNPRINTF 1
+
 /* Define to 1 if you have the <stddef.h> header file. */
 #define HAVE_STDDEF_H 1
 
@@ -272,6 +304,15 @@
 /* Define to 1 if you have the `vprintf' function. */
 #define HAVE_VPRINTF 1
 
+/* Define if you have the 'wchar_t' type. */
+#define HAVE_WCHAR_T 1
+
+/* Define to 1 if you have the `wcslen' function. */
+#define HAVE_WCSLEN 1
+
+/* Define if you have the 'wint_t' type. */
+#define HAVE_WINT_T 1
+
 /* Define to 1 if you have the `__argz_count' function. */
 /* #undef HAVE___ARGZ_COUNT */
 
@@ -288,7 +329,7 @@
 /* #undef HAVE___SECURE_GETENV */
 
 /* Define as const if the declaration of iconv() needs const. */
-/* #undef ICONV_CONST */
+#define ICONV_CONST const
 
 /* Define if integer division by zero raises signal SIGFPE. */
 #define INTDIV0_RAISES_SIGFPE 1
@@ -303,13 +344,13 @@
 #define PACKAGE_NAME "GNU Texinfo"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GNU Texinfo 4.6"
+#define PACKAGE_STRING "GNU Texinfo 4.7"
 
 /* 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.6"
+#define PACKAGE_VERSION "4.7"
 
 /* Define if <inttypes.h> exists and defines unusable PRI* macros. */
 /* #undef PRI_MACROS_BROKEN */
@@ -317,12 +358,16 @@
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void
 
+/* Define as the maximum value of type 'size_t', if the system doesn't define
+   it. */
+/* #undef SIZE_MAX */
+
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
    automatically deduced at run-time.
-        STACK_DIRECTION > 0 => grows toward higher addresses
+	STACK_DIRECTION > 0 => grows toward higher addresses
-        STACK_DIRECTION < 0 => grows toward lower addresses
+	STACK_DIRECTION < 0 => grows toward lower addresses
-        STACK_DIRECTION = 0 => direction of growth unknown */
+	STACK_DIRECTION = 0 => direction of growth unknown */
 /* #undef STACK_DIRECTION */
 
 /* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
@@ -335,7 +380,7 @@
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */
-#define VERSION "4.6"
+#define VERSION "4.7"
 
 /* Define to 1 if on MINIX. */
 /* #undef _MINIX */
@@ -350,9 +395,11 @@
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
 
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
+/* Define to `__inline__' or `__inline' if that's what the C compiler
-   if it is not supported. */
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
 /* #undef inline */
+#endif
 
 /* Define to rpl_mkstemp if the replacement function should be used. */
 /* #undef mkstemp */
@@ -360,6 +407,13 @@
 /* Define to `long' if <sys/types.h> does not define. */
 /* #undef off_t */
 
+/* Define as the type of the result of subtracting two pointers, if the system
+   doesn't define it. */
+/* #undef ptrdiff_t */
+
+/* Define to empty if the C compiler doesn't support this keyword. */
+/* #undef signed */
+
 /* Define to `unsigned' if <sys/types.h> does not define. */
 /* #undef size_t */
 

gnu/usr.bin/texinfo/infokey/Makefile

@@ -1,11 +1,10 @@
-#	$NetBSD: Makefile,v 1.1 2003/01/17 16:04:16 wiz Exp $
+#	$NetBSD: Makefile,v 1.2 2004/07/12 23:45:26 wiz Exp $
 
 PROG=		infokey
 SRCS=		infokey.c key.c
-NOMAN=		# defined
 
 CPPFLAGS+=	-I${IDIST}/info
 
 .include <bsd.prog.mk>
 
-.PATH: ${IDIST}/info
+.PATH: ${IDIST}/info ${IDIST}/doc

gnu/usr.bin/texinfo/makeinfo/Makefile

@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.5 2003/01/17 15:32:24 wiz Exp $
+#	$NetBSD: Makefile,v 1.6 2004/07/12 23:45:26 wiz Exp $
 
 PROG=		makeinfo
-SRCS=		cmds.c defun.c files.c footnote.c \
+SRCS=		cmds.c defun.c files.c float.c footnote.c \
 		html.c index.c insertion.c lang.c \
 		macro.c makeinfo.c multi.c node.c \
-		sectioning.c toc.c xml.c
+		sectioning.c toc.c xml.c xref.c
 
 CPPFLAGS+=	-I${IDIST}/makeinfo