| blob | 3990db3cc0be6e6f7683111db0c7a6818fa267ce |
1 diff -rNU3 texinfo.orig/AUTHORS texinfo/AUTHORS
2 --- texinfo.orig/AUTHORS 2004-04-11 19:56:45.000000000 +0200
3 +++ texinfo/AUTHORS 2015-10-18 11:13:23.000000000 +0200
4 @@ -1,4 +1,4 @@
5 -$Id: AUTHORS,v 1.10 2004/04/11 17:56:45 karl Exp $
6 +Id: AUTHORS,v 1.10 2004/04/11 17:56:45 karl Exp
7 Texinfo authors.
9 Copyright (C) 2003 Free Software Foundation, Inc.
10 diff -rNU3 texinfo.orig/INSTALL texinfo/INSTALL
11 --- texinfo.orig/INSTALL 2004-11-19 14:08:47.000000000 +0100
12 +++ texinfo/INSTALL 2015-10-18 11:13:23.000000000 +0200
13 @@ -1,4 +1,4 @@
14 -$Id: INSTALL,v 1.5 2004/11/19 13:08:47 karl Exp $
15 +Id: INSTALL,v 1.5 2004/11/19 13:08:47 karl Exp
17 Copying and distribution of this file, with or without modification,
18 are permitted in any medium without royalty provided the copyright
19 diff -rNU3 texinfo.orig/INTRODUCTION texinfo/INTRODUCTION
20 --- texinfo.orig/INTRODUCTION 2004-04-11 19:56:45.000000000 +0200
21 +++ texinfo/INTRODUCTION 2015-10-18 11:13:23.000000000 +0200
22 @@ -1,4 +1,4 @@
23 -$Id: INTRODUCTION,v 1.3 2004/04/11 17:56:45 karl Exp $
24 +Id: INTRODUCTION,v 1.3 2004/04/11 17:56:45 karl Exp
25 Getting started with Texinfo.
27 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
28 diff -rNU3 texinfo.orig/Makefile.am texinfo/Makefile.am
29 --- texinfo.orig/Makefile.am 2004-12-15 19:14:56.000000000 +0100
30 +++ texinfo/Makefile.am 2015-10-18 11:13:23.000000000 +0200
31 @@ -1,5 +1,5 @@
32 # Makefile.am for texinfo.
33 -# $Id: Makefile.am,v 1.13 2004/12/15 16:53:59 kasal Exp $
34 +# Id: Makefile.am,v 1.13 2004/12/15 16:53:59 kasal Exp
35 # Process this file with automake to produce Makefile.in in all directories.
36 #
37 # This file is free software; as a special exception the author gives
38 diff -rNU3 texinfo.orig/Makefile.in texinfo/Makefile.in
39 --- texinfo.orig/Makefile.in 2004-12-31 19:01:49.000000000 +0100
40 +++ texinfo/Makefile.in 2015-10-18 11:13:23.000000000 +0200
41 @@ -15,7 +15,7 @@
42 @SET_MAKE@
44 # Makefile.am for texinfo.
45 -# $Id: Makefile.am,v 1.13 2004/12/15 16:53:59 kasal Exp $
46 +# Id: Makefile.am,v 1.13 2004/12/15 16:53:59 kasal Exp
47 # Process this file with automake to produce Makefile.in in all directories.
48 #
49 # This file is free software; as a special exception the author gives
50 @@ -230,7 +230,7 @@
51 # This is to prevent texinfo.tex from being included in the top-level
52 # distribution directory.
53 TEXINFO_TEX = doc/texinfo.tex
54 -@TOOLS_ONLY_FALSE@SUBDIRS = $(native_tools) intl m4 lib info makeinfo po util doc
55 +@TOOLS_ONLY_FALSE@SUBDIRS = $(native_tools) intl m4 lib makeinfo po util doc
56 @TOOLS_ONLY_TRUE@SUBDIRS = lib info makeinfo util
58 # for gettext.
59 diff -rNU3 texinfo.orig/NEWS texinfo/NEWS
60 --- texinfo.orig/NEWS 2004-12-31 19:01:29.000000000 +0100
61 +++ texinfo/NEWS 2015-10-18 11:13:23.000000000 +0200
62 @@ -1,4 +1,4 @@
63 -$Id: NEWS,v 1.103 2004/12/24 16:43:58 karl Exp $
64 +Id: NEWS,v 1.103 2004/12/24 16:43:58 karl Exp
65 This file records noteworthy changes, very tersely.
66 See the manual for detailed information.
68 diff -rNU3 texinfo.orig/README texinfo/README
69 --- texinfo.orig/README 2004-12-13 14:36:32.000000000 +0100
70 +++ texinfo/README 2015-10-18 11:13:23.000000000 +0200
71 @@ -1,4 +1,4 @@
72 -$Id: README,v 1.16 2004/12/13 13:36:32 karl Exp $
73 +Id: README,v 1.16 2004/12/13 13:36:32 karl Exp
74 This is the README file for the GNU Texinfo distribution. Texinfo is
75 the preferred documentation format for GNU software.
77 diff -rNU3 texinfo.orig/README.dev texinfo/README.dev
78 --- texinfo.orig/README.dev 2003-11-24 16:11:06.000000000 +0100
79 +++ texinfo/README.dev 2015-10-18 11:13:23.000000000 +0200
80 @@ -1,4 +1,4 @@
81 -$Id: README.dev,v 1.7 2003/11/24 15:11:06 karl Exp $
82 +Id: README.dev,v 1.7 2003/11/24 15:11:06 karl Exp
83 README.dev - Texinfo developer information.
85 Copyright (C) 2002, 2003 Free Software Foundation, Inc.
86 diff -rNU3 texinfo.orig/TODO texinfo/TODO
87 --- texinfo.orig/TODO 2004-11-23 00:57:32.000000000 +0100
88 +++ texinfo/TODO 2015-10-18 11:13:23.000000000 +0200
89 @@ -1,4 +1,4 @@
90 -$Id: TODO,v 1.26 2004/11/22 23:57:32 karl Exp $
91 +Id: TODO,v 1.26 2004/11/22 23:57:32 karl Exp
92 This is the todo list for GNU Texinfo.
93 If you are interested in working on any of these, email bug-texinfo@gnu.org.
95 diff -rNU3 texinfo.orig/config.guess texinfo/config.guess
96 --- texinfo.orig/config.guess 2004-11-14 14:10:31.000000000 +0100
97 +++ texinfo/config.guess 2015-10-18 11:13:23.000000000 +0200
98 @@ -780,7 +780,7 @@
99 *:FreeBSD:*:*)
100 echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
101 exit 0 ;;
102 - i*:CYGWIN*:*)
103 + i*:CYGWIN*:* | x86*:CYGWIN*:*)
104 echo ${UNAME_MACHINE}-pc-cygwin
105 exit 0 ;;
106 i*:MINGW*:*)
107 @@ -923,6 +923,9 @@
108 sparc:Linux:*:* | sparc64:Linux:*:*)
109 echo ${UNAME_MACHINE}-unknown-linux-gnu
110 exit 0 ;;
111 + tile*:Linux:*:*)
112 + echo ${UNAME_MACHINE}-unknown-linux-gnu
113 + exit 0 ;;
114 x86_64:Linux:*:*)
115 echo x86_64-unknown-linux-gnu
116 exit 0 ;;
117 diff -rNU3 texinfo.orig/configure texinfo/configure
118 --- texinfo.orig/configure 2004-12-31 19:01:50.000000000 +0100
119 +++ texinfo/configure 2015-10-18 11:13:23.000000000 +0200
120 @@ -1771,6 +1771,30 @@
124 +echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
125 +echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
126 + # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
127 +if test "${enable_maintainer_mode+set}" = set; then
128 + enableval="$enable_maintainer_mode"
129 + USE_MAINTAINER_MODE=$enableval
130 +else
131 + USE_MAINTAINER_MODE=no
132 +fi;
133 + echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
134 +echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
135 +
136 +
137 +if test $USE_MAINTAINER_MODE = yes; then
138 + MAINTAINER_MODE_TRUE=
139 + MAINTAINER_MODE_FALSE='#'
140 +else
141 + MAINTAINER_MODE_TRUE='#'
142 + MAINTAINER_MODE_FALSE=
143 +fi
144 +
145 + MAINT=$MAINTAINER_MODE_TRUE
146 +
147 +
149 # When the Texinfo source is imported into other repositories
150 # (NetBSD and TeX Live), timestamps are generally not preserved. This
151 diff -rNU3 texinfo.orig/configure.ac texinfo/configure.ac
152 --- texinfo.orig/configure.ac 2004-12-31 19:00:48.000000000 +0100
153 +++ texinfo/configure.ac 2015-10-18 11:13:23.000000000 +0200
154 @@ -1,5 +1,5 @@
155 # Process this file with autoconf to produce a configure script.
156 -# $Id: configure.ac,v 1.50 2004/12/22 13:29:44 karl Exp $
157 +# Id: configure.ac,v 1.50 2004/12/22 13:29:44 karl Exp
158 #
159 # This file is free software; as a special exception the author gives
160 # unlimited permission to copy and/or distribute it, with or without
161 diff -rNU3 texinfo.orig/djgpp/README texinfo/djgpp/README
162 --- texinfo.orig/djgpp/README 2002-09-27 00:01:10.000000000 +0200
163 +++ texinfo/djgpp/README 1970-01-01 01:00:00.000000000 +0100
164 @@ -1,431 +0,0 @@
165 -Building and installing GNU Texinfo with DJGPP v2.x
166 -===================================================
167 -
168 -This directory holds files required for building Texinfo with DJGPP
169 -tools for MS-DOS and MS-Windows. If you got this file with a binary
170 -distribution, look for the "Installation" section below.
171 -
172 -
173 -1. Building Texinfo
174 - ----------------
175 -
176 - a. To compile Texinfo, you will need the following tools:
177 -
178 - - basic DJGPP development environment: GCC, Binutils and djdev;
179 - - a DJGPP port of GNU Make version 3.78 or later;
180 - - a DJGPP port of Bash 2.04 or later;
181 - - a port of GNU Sed 3.02 or later;
182 - - DJGPP ports of Fileutils, Textutils, Sh-utils, Diffutils,
183 - Gawk and Grep;
184 - - etags (from the Emacs distribution) and mkid (from ID-utils)
185 - if you need the TAGS and ID targets of the Makefile's.
186 -
187 - All of the above are available from the DJGPP ftp sites on
188 - SimTel.NET mirrors, in the v2gnu directory.
189 -
190 - b. From the root of your DJGPP installation, unzip the source package:
191 -
192 - - if you are unpacking the official GNU source distribution:
193 -
194 - tar -xvzf texinfo-X.YZ.tar.gz
195 -
196 - or
197 -
198 - djtar -x texinfo-X.YZ.tar.gz
199 -
200 - where X.YZ is the version number. (Users of MS-DOS and
201 - MS-Windows 3.X, which don't support long file names, will need
202 - to rename the archive to something like texi-XYZ.tgz.)
203 -
204 - - if you are unpacking a source distribution from a DJGPP ftp
205 - site:
206 -
207 - unzip txiXYZs
208 -
209 - or
210 -
211 - pkunzip -d txiXYZs
212 -
213 - If you build Texinfo on Windows 9X, Windows ME, Windows 2000 or
214 - Windows XP, you are advised to use a version of Unzip which
215 - supports long filenames, so that the original long filenames of
216 - the source files will be preserved. Otherwise, the build
217 - procedure will most probably fail.
218 -
219 - Do NOT use an unzip program which supports long file names on
220 - Windows NT 4, as DJGPP doesn't support long names there.
221 -
222 - The program unzip32.exe, available from the SimTel.NET site,
223 - will deal correctly with long file names on any platform, so it
224 - is the recommended way of unzipping txiXYZs.zip archives.
225 -
226 - c. If the source distribution comes with a ready Makefile (this is
227 - usually the case with archives downloaded from the DJGPP sites),
228 - and all you need is to build Texinfo, you may skip the configure
229 - step below and go directly to step e.
230 -
231 - d. To build the official GNU distribution, or to configure Texinfo
232 - for any environment but stock DJGPP v2.x, run djgpp\config.bat
233 - first, like this:
234 -
235 - SRCDIR\djgpp\config SRCDIR
236 -
237 - Here SRCDIR is the directory where you unpacked the sources. If
238 - you are configuring from the source directory itself, you may
239 - omit the argument to the config.bat file. If you do supply the
240 - argument, you MUST use forward slashes in it, or else the batch
241 - file might fail.
242 -
243 - config.bat sets some environment variables, then invokes the
244 - configure script. The script will run for a few minutes and
245 - create Makefile's in all the directories, and the config.h file.
246 -
247 - e. Run `Make'. This builds the programs and the Info files.
248 -
249 -
250 -
251 -2. Installation
252 - ------------
253 -
254 - a. If you are installing the binary distribution, then go to your
255 - main DJGPP directory and unzip the files. For instance, if your
256 - DJGPP installation is rooted on C:\DJGPP, then type this (XYZ is
257 - the version number):
258 -
259 - cd c:\djgpp
260 - unzip txiXYZb
261 -
262 - or, if you prefer `pkunzip':
263 -
264 - pkunzip -d txiXYZb
265 -
266 - b. If you downloaded and built Texinfo from sources, install by
267 - invoking Make:
268 -
269 - make install
270 -
271 - This requires a port of Unix-like program `install.exe'. It is
272 - available from the DJGPP port of GNU Fileutils on SimTel.NET.
273 -
274 - c. Info needs a file named DIR with the top-level menu of all the
275 - Info files installed on your system. If you installed the DJGPP
276 - development environment (djdevNN.zip), then you already have
277 - this file in the info/ subdirectory of your DJGPP installation.
278 - Otherwise, you will need to create it. A minimal DIR file is
279 - available in this distribution under the name `dir-example',
280 - which you can use as a starting point. Copy it to the directory
281 - where you install the Info files from this distribution.
282 -
283 - Even if you already have a DIR file, you should review it to
284 - make sure it is consistent with the names of the Info file you
285 - are installing. Here's how your Texinfo-related entries in DIR
286 - should look like:
287 -
288 - * Info: (info).
289 - Documentation browsing system. This topic teaches you about
290 - how to use the online help information.
291 -
292 - * Info-Standalone: (info-stnd).
293 - This topic helps you use the standalone Info-Program (info.exe)
294 -
295 - * infokey: (info-stnd)Invoking infokey.
296 - Compile Info key customizations.
297 -
298 - * Makeinfo: (texinfo)Invoking makeinfo.
299 - Convert a .texinfo file (.txi) to an info file suitable for the
300 - info reader or Emacs, into plain ASCII, into HTML, into XML,
301 - or into DocBook.
302 -
303 - * Texinfo: (texinfo).
304 - With one source file, make either a printed manual (through TeX)
305 - or an on-line manual (through makeinfo). This topic includes
306 - a full description of the Texinfo language and related
307 - facilities, including Emacs commands to work with Texinfo files.
308 -
309 - * install-info: (texinfo)Invoking install-info.
310 - How to update info/dir entries when installing GNU packages.
311 -
312 - * texi2dvi: (texinfo)Format with texi2dvi.
313 - Printing Texinfo documentation with TeX.
314 -
315 - * texindex: (texinfo)Format with tex/texindex.
316 - Sorting Texinfo index files automatically.
317 -
318 -
319 - Note that the asterisk `*' should be flushed all the way to the
320 - left, it is indented here just to make reading more convenient.
321 -
322 - If your DIR file entries differ from these, I suggest to edit them
323 - so they are as shown above. Otherwise, Info might not be able to
324 - find some of the files. You HAVE been warned!
325 -
326 - d. Optionally, set up environment variables for Info. These are:
327 -
328 - * INFO_LINES -- screen size for Info.
329 - * INFO_COLORS -- screen colors for Info.
330 -
331 - (If you have DJGPP installed on your system, the file djgpp.env
332 - which comes with it already has entries for Info, see the [info]
333 - section there.)
334 -
335 - INFO_LINES can be one of 25 (the default), 28, 35, 40, 43, or 50
336 - (that's if you have a VGA; EGAs only support 25, 35 and 43 lines).
337 - I recommend 40 if your monitor is 17" or larger, and at least 28
338 - lines for smaller monitors (I work with 40 lines even on 14"
339 - monitors).
340 -
341 - INFO_COLORS should have the following syntax:
342 -
343 - set INFO_COLORS=XX.YY
344 -
345 - where XX is the text attribute for text displayed in the text
346 - windows and the echo area, and YY is the text attribute for the
347 - modeline (aka the status line). Each attribute is a numeric
348 - value of a byte which describes the desired combination of
349 - foreground and background colors. The individual bits in the
350 - attribute byte are defined as follows:
351 -
352 - bBBBFFFF
353 -
354 - where `b' is the blink bit, `BBB' are the 3 bits for background
355 - color and `FFFF' are the 4 bits for the foreground color. This is
356 - the usual PC text attribute byte structure, and is further explained
357 - in any standard reference on text-mode programming for the PC.
358 -
359 - My favorite setting for INFO_COLORS is `0x1e.0x31'. This makes
360 - Info use yellow foreground on blue background for the text and
361 - blue foreground on cyan background for the modelines.
362 -
363 - After you've played with these variables and have chosen the values
364 - you like, it's a good idea to put them on the DJGPP.ENV file, in the
365 - [info] section.
366 -
367 - e. Beginning with version 3.6, GNU Info can read Unix man pages. If
368 - you have a `man' clone on your system and would like to be able to
369 - read man pages with Info, read the chapter ``Reading Man Pages''
370 - below. One such clone is available as v2apps/manXYb.zip from
371 - the DJGPP sites (XY is the version number).
372 -
373 - f. This port supports compressed Info files, like what Info under Unix
374 - gives you. For this to work, you will need to install a DOS port of
375 - GNU `Gzip' package and to observe certain rules of file naming, so
376 - that Info will find the compressed files working around the DOS 8.3
377 - filename restriction. The chapter ``Compressed Info Files'' below
378 - explains the details of this.
379 -
380 - g. If you need to use the `print-node' command, read the chapter
381 - ``Printing Nodes'' below.
382 -
383 - h. That's it! You are now ready to use Info, Makeinfo, and Texindex.
384 - To learn about them, type `Info' and press [Enter]. You will be
385 - presented with the top-level menu of GNU/DJGPP hypertext
386 - documentation. If you are unfamiliar with Info, press `?' to see
387 - the available commands. Pressing `h' will cause Info to take you on
388 - a guided tour through its features (recommended for first-time
389 - users).
390 -
391 - i. If you are used to Info ports of versions before 3.6, you should
392 - know that the command bindings to PC-specific keys has changed: the
393 - numeric keypad keys invoke the same commands as their extended
394 - namesakes. That is, e.g., the key `PgUp' on the numeric keypad
395 - invokes the same command as the grey `PgUp' key on the extended
396 - keypad. This was done at DJ's request, because laptop machines
397 - don't have extended keys. Commands to move between nodes
398 - (previously bound to numeric keypad) are now bound to Ctrl-
399 - varieties of numeric keypad keys (e.g., `next-node' is on
400 - `Ctrl-PgDn', `prev-node' is on `Ctrl-PgUp', etc.). You can use
401 - the `Alt-x describe-key' command to see which command is invoked
402 - by a particular key.
403 -
404 - j. There are several MSDOS-specific changes in Texinfo, relative to
405 - previous Texinfo ports (for other changes, see the file NEWS):
406 -
407 - * Full support for both forward and backslashes in all file
408 - names. Previously, Info was sensitive to the style of
409 - slashes in directories mentioned in the INFOPATH environment
410 - variable.
411 -
412 - * The default operation of the `print-node' command has been
413 - changed so that it automatically prints to the local printer
414 - device connected to the PRN port. (If your printer is
415 - connected to another port, set the INFO_PRINT_COMMAND
416 - environment variable like this:
417 -
418 - set INFO_PRINT_COMMAND=>LPT2
419 -
420 - In other words, if the value of INFO_PRINT_COMMAND begins
421 - wih a `>' character, Info will write to the file or device
422 - whose name follows the `>' character. (Don't leave any
423 - blanks between `>' and the device name!).
424 -
425 - Note that some old versions of stock DOS shell won't let you
426 - use the `>' character in environment variables set from the
427 - DOS prompt or batch files, but you can set it in the [info]
428 - section of your DJGPP.ENV file.
429 -
430 - * The `set-screen-height' command now actually changes the
431 - screen dimensions from within Info if you specify one of the
432 - sizes supported by your video hardware.
433 -
434 - * If you don't have a `man' clone installed, and you invoke
435 - Info with a name of a document which Info cannot find, it
436 - will no longer wait for 15 seconds.
437 -
438 - * Several bugs in handling of man pages were corrected.
439 -
440 - * Info opens the dribble and input files in BINARY mode. This
441 - allows to record keystrokes and restore them in another Info
442 - session, thus using dribble files as a startup or init file
443 - which changes default behavior, binds keys, etc.
444 -
445 - * Info recognizes a new DOS-specific command-line option `-b'
446 - or `--speech-friendly'. This option causes Info to use DOS
447 - I/O functions (`printf', `puts', etc.) instead of direct
448 - screen writes, which is required to enable speech
449 - synthesizer software (used by visually-impaired people) to
450 - grab the output. When this option is given, the screen
451 - colors defined by the `INFO_COLORS' environment variable and
452 - the visible-bell feature will be disabled, because stdio
453 - functions don't support neither color text nor inverting
454 - screen colors. This improvement was suggested and
455 - originally implemented by Hans-Bernhard Broeker
456 - <Broeker@physik.rwth-aachen.de>.
457 -
458 - * Makeinfo now generates full .info-NN filenames when long
459 - filenames are supported (e.g. on Win9x) and short .iNN
460 - filenames otherwise. When the Texinfo source or the
461 - command-line parameter -o specify an output file with no
462 - extension (like `texinfo'), and long filenames aren't
463 - supported, Makeinfo will make sure the generated names will
464 - be unique (it will create e.g. `texinf-1', `texin-10' etc.).
465 -
466 - * The texi2dvi script is now fully compatible with
467 - MS-DOS/MS-Windows and with the DJGPP port of TeX.
468 -
469 -
470 -3. Reading Man Pages
471 - -----------------
472 -
473 - Yes, Info can now read man pages! This port supports that feature,
474 - but for it to work, you will have to make sure your `man' clone is
475 - set up correctly:
476 -
477 - a. You should have an executable file named `man.exe', `man.com'
478 - etc. somewhere on your PATH.
479 -
480 - b. When invoked with redirected stdout, that executable should
481 - print the contents of the file it gets as its argument to stdout
482 - and exit. If your man command calls some pager, that pager
483 - should have this behavior (various ports of Unix command `more'
484 - and the DJGPP port of GNU Less behave that way).
485 -
486 - One `man' clone is available as v2apps/manNNb.zip from the DJGPP
487 - sites on SimTel.NET.
488 -
489 -
490 -4. Compressed Info Files
491 - ---------------------
492 -
493 - Info allows you to hold your Info files in compressed form, to save
494 - disk space. When a file Info wants cannot be found, it will
495 - automatically try to find that file in compressed form. Info does
496 - this by trying to find the original file with specific extensions.
497 - Each extension tells Info which program should be called to
498 - decompress the file.
499 -
500 - This port supports compression by the GNU Gzip program. When Info
501 - cannot find a file `foo', it will first try to find `foo.z' or
502 - `foo.gz'. If this fails, and the file has an extension, the last
503 - one or two characters of the extension are replaced by `z' and `gz'
504 - respectively, and Info tries again. If it finds any of these, it
505 - will call the `GUnzip' program to decompress the file, catch its
506 - output and display it. (The original compressed file stays
507 - intact.)
508 -
509 - So, to use this feature, compress your files with Gzip and call the
510 - compressed files using the following as guidelines:
511 -
512 - foo --> foo.gz
513 - foo.inf --> foo.igz
514 - foo.i5 --> foo.i5z
515 - foo.25 --> foo.25z
516 -
517 - If you have a package whose Info docs are split into more than 9
518 - sub-files and you need to compress those files, you will have to
519 - rename the sub-files from `foo.iNN' to `foo.NN' so that there will
520 - be place for the trailing `z' in the compressed names. Don't
521 - forget to edit the indirect file table in the main Info file and
522 - change the sub-file filenames there too!
523 -
524 - An alternative for those packages which have more than 99 Info
525 - sub-files is to generate them from the Texinfo sources and force
526 - Makeinfo to produce files without the .iNN extensions, like this:
527 -
528 - makeinfo -o foo foo.txi
529 -
530 - This causes Makeinfo to generate file names like foo-1, foo-2,
531 - etc., which leave more place for the numeric index. If necessary,
532 - Makeinfo will automatically remove characters from the end of the
533 - argument to `-o'. For example, "-o texinfo" produces files
534 - texinf-1, ..., texin-10, ..., texi-100, etc. on platforms which
535 - only support 8+3 file names.
536 -
537 - Saying "@setfilename foo" near the beginning of the Texinfo source
538 - file is another way of forcing Makeinfo to produce files without
539 - the .iNN extensions.
540 -
541 - Using Makeinfo to produce files whose names are "compression-ready"
542 - is more convenient, since you don't need to edit the the indirect
543 - file table to reflect the changes in file names.
544 -
545 - On platforms which support long filenames, the usual Info behavior
546 - of appending `.gz' or `.Z' to the original filename also works;
547 - this is done *before* Info checks the above butchered names.
548 -
549 - Special considerations apply if you are installing Info on dual
550 - DOS/Windows 9X/ME/2K/XP system, where you'd like Info to work with
551 - the same files both in plain DOS and from the Windows DOS box. In
552 - this case, you should make sure your compressed Info files follow
553 - the 8+3 DOS naming conventions outlined above, even though Info
554 - supports long file names on Windows 9X. Also, you need to turn off
555 - the generation of numeric tails in short 8+3 aliases Windows
556 - creates for long names (if you don't know how, the DJGPP FAQ list
557 - explains it).
558 -
559 - Please note: for the automatic decompression to work, Info must be
560 - able to find the file it looks for with an extension which
561 - indicates that the file is compressed. Do NOT call the compressed
562 - files as the original uncompressed files were called, or Info
563 - won't be able to find them! File names like bison-1, gcc.i10 or
564 - make.info-3 have nothing in them to suggest that they are
565 - compressed, so don't expect Info to uncompress them.
566 -
567 -
568 -5. Printing Nodes
569 - --------------
570 -
571 - Info has a `print-node' command. It works by piping the contents of
572 - the current node through a program which is named by the environment
573 - variable INFO_PRINT_COMMAND. That command should read its standard
574 - input and write it to your printer. Find any such program, put its
575 - name into the above environment variable, and you can print nodes from
576 - within Info.
577 -
578 - If the value of INFO_PRINT_COMMAND begins with a redirection
579 - character `>', Info will write the contents of the node to the file
580 - whose name follows the `>' character.
581 -
582 - If INFO_PRINT_COMMAND is not defined, the DJGPP port will use
583 - ">PRN" as the default, which causes it to print to the local printer
584 - device, PRN.
585 -
586 -6. Bug Reports
587 - -----------
588 -
589 - If you see any bugs which seem specific to this DOS port, please tell
590 - me about them.
591 -
592 -
593 - Enjoy,
594 -
595 - Eli Zaretskii <eliz@is.elta.co.il>
596 diff -rNU3 texinfo.orig/djgpp/config.bat texinfo/djgpp/config.bat
597 --- texinfo.orig/djgpp/config.bat 2004-12-17 23:47:55.000000000 +0100
598 +++ texinfo/djgpp/config.bat 1970-01-01 01:00:00.000000000 +0100
599 @@ -1,240 +0,0 @@
600 -@echo off
601 -
602 -echo Configuring GNU Texinfo for DJGPP v2.x...
603 -
604 -Rem The small_env tests protect against fixed and too small size
605 -Rem of the environment in stock DOS shell.
606 -
607 -Rem Find out if NLS is wanted or not, if dependency-tracking is
608 -Rem wanted or not, if cache is wanted or not, and where the sources are.
609 -set ARGS=
610 -set NLS=disabled
611 -if not "%NLS%" == "disabled" goto small_env
612 -set CACHE=enabled
613 -if not "%CACHE%" == "enabled" goto small_env
614 -set DEPTRAK=disabled
615 -if not "%DEPTRAK%" == "disabled" goto small_env
616 -set XSRC=.
617 -if not "%XSRC%" == "." goto small_env
618 -
619 -Rem Loop over all arguments.
620 -Rem Special arguments are: NLS, XSRC CACHE and DEPS.
621 -Rem All other arguments are stored into ARGS.
622 -:arg_loop
623 -set SPECARG=0
624 -if not "%SPECARG%" == "0" goto small_env
625 -if not "%1" == "NLS" if not "%1" == "nls" goto cache_opt
626 -if "%1" == "nls" set NLS=enabled
627 -if "%1" == "NLS" set NLS=enabled
628 -if not "%NLS%" == "enabled" goto small_env
629 -set SPECARG=1
630 -if not "%SPECARG%" == "1" goto small_env
631 -shift
632 -:cache_opt
633 -set SPECARG=0
634 -if not "%SPECARG%" == "0" goto small_env
635 -if "%1" == "no-cache" goto cache_off
636 -if "%1" == "no-CACHE" goto cache_off
637 -if not "%1" == "NO-CACHE" goto dependency_opt
638 -:cache_off
639 -if "%1" == "no-cache" set CACHE=disabled
640 -if "%1" == "no-CACHE" set CACHE=disabled
641 -if "%1" == "NO-CACHE" set CACHE=disabled
642 -if not "%CACHE%" == "disabled" goto small_env
643 -set SPECARG=1
644 -if not "%SPECARG%" == "1" goto small_env
645 -shift
646 -:dependency_opt
647 -set SPECARG=0
648 -if not "%SPECARG%" == "0" goto small_env
649 -if "%1" == "dep" goto dep_off
650 -if not "%1" == "DEP" goto src_dir_opt
651 -:dep_off
652 -if "%1" == "dep" set DEPTRAK=enabled
653 -if "%1" == "DEP" set DEPTRAK=enabled
654 -if not "%DEPTRAK%" == "enabled" goto small_env
655 -set SPECARG=1
656 -if not "%SPECARG%" == "1" goto small_env
657 -shift
658 -:src_dir_opt
659 -set SPECARG=0
660 -if not "%SPECARG%" == "0" goto small_env
661 -echo %1 | grep -q "/"
662 -if errorlevel 1 goto collect_arg
663 -set XSRC=%1
664 -if not "%XSRC%" == "%1" goto small_env
665 -set SPECARG=1
666 -if not "%SPECARG%" == "1" goto small_env
667 -:collect_arg
668 -if "%SPECARG%" == "0" set _ARGS=%ARGS% %1
669 -if "%SPECARG%" == "0" if not "%_ARGS%" == "%ARGS% %1" goto small_env
670 -echo %_ARGS% | grep -q "[^ ]"
671 -if not errorlevel 0 set ARGS=%_ARGS%
672 -set _ARGS=
673 -shift
674 -if not "%1" == "" goto arg_loop
675 -set SPECARG=
676 -
677 -Rem Create a response file for the configure script.
678 -echo --srcdir=%XSRC% > arguments
679 -if "%CACHE%" == "enabled" echo --config-cache >>arguments
680 -if "%DEPTRAK%" == "enabled" echo --enable-dependency-tracking >>arguments
681 -if "%DEPTRAK%" == "disabled" echo --disable-dependency-tracking >>arguments
682 -if not "%ARGS%" == "" echo %ARGS% >>arguments
683 -set ARGS=
684 -set CACHE=
685 -set DEPTRAK=
686 -
687 -if "%XSRC%" == "." goto in_place
688 -
689 -:not_in_place
690 -redir -e /dev/null update %XSRC%/configure.orig ./configure
691 -test -f ./configure
692 -if errorlevel 1 update %XSRC%/configure ./configure
693 -
694 -:in_place
695 -Rem Update configuration files
696 -echo Updating configuration scripts...
697 -test -f ./configure.orig
698 -if errorlevel 1 update configure configure.orig
699 -sed -f %XSRC%/djgpp/config.sed configure.orig > configure
700 -if errorlevel 1 goto sed_error
701 -
702 -Rem Make sure they have a config.site file
703 -set CONFIG_SITE=%XSRC%/djgpp/config.site
704 -if not "%CONFIG_SITE%" == "%XSRC%/djgpp/config.site" goto small_env
705 -
706 -Rem Make sure crucial file names are not munged by unpacking
707 -test -f %XSRC%/po/Makefile.in.in
708 -if not errorlevel 1 mv -f %XSRC%/po/Makefile.in.in %XSRC%/po/Makefile.in-in
709 -test -f %XSRC%/po/Makefile.am.in
710 -if not errorlevel 1 mv -f %XSRC%/po/Makefile.am.in %XSRC%/po/Makefile.am-in
711 -
712 -Rem This is required because DOS/Windows are case-insensitive
713 -Rem to file names, and "make install" will do nothing if Make
714 -Rem finds a file called `install'.
715 -if exist INSTALL ren INSTALL INSTALL.txt
716 -
717 -Rem Set HOME to a sane default so configure stops complaining.
718 -if not "%HOME%" == "" goto host_name
719 -set HOME=%XSRC%/djgpp
720 -if not "%HOME%" == "%XSRC%/djgpp" goto small_env
721 -echo No HOME found in the environment, using default value
722 -
723 -:host_name
724 -Rem Set HOSTNAME so it shows in config.status
725 -if not "%HOSTNAME%" == "" goto hostdone
726 -if "%windir%" == "" goto msdos
727 -set OS=MS-Windows
728 -if not "%OS%" == "MS-Windows" goto small_env
729 -goto haveos
730 -:msdos
731 -set OS=MS-DOS
732 -if not "%OS%" == "MS-DOS" goto small_env
733 -:haveos
734 -if not "%USERNAME%" == "" goto haveuname
735 -if not "%USER%" == "" goto haveuser
736 -echo No USERNAME and no USER found in the environment, using default values
737 -set HOSTNAME=Unknown PC
738 -if not "%HOSTNAME%" == "Unknown PC" goto small_env
739 -goto userdone
740 -:haveuser
741 -set HOSTNAME=%USER%'s PC
742 -if not "%HOSTNAME%" == "%USER%'s PC" goto small_env
743 -goto userdone
744 -:haveuname
745 -set HOSTNAME=%USERNAME%'s PC
746 -if not "%HOSTNAME%" == "%USERNAME%'s PC" goto small_env
747 -:userdone
748 -set _HOSTNAME=%HOSTNAME%, %OS%
749 -if not "%_HOSTNAME%" == "%HOSTNAME%, %OS%" goto small_env
750 -set HOSTNAME=%_HOSTNAME%
751 -:hostdone
752 -set _HOSTNAME=
753 -set OS=
754 -
755 -Rem install-sh is required by the configure script but clashes with the
756 -Rem various Makefile install-foo targets, so we MUST have it before the
757 -Rem script runs and rename it afterwards
758 -test -f %XSRC%/install-sh
759 -if not errorlevel 1 goto no_ren0
760 -test -f %XSRC%/install-sh.sh
761 -if not errorlevel 1 mv -f %XSRC%/install-sh.sh %XSRC%/install-sh
762 -:no_ren0
763 -
764 -if "%NLS%" == "disabled" goto without_NLS
765 -
766 -:with_NLS
767 -Rem Check for the needed libraries and binaries.
768 -test -x /dev/env/DJDIR/bin/msgfmt.exe
769 -if not errorlevel 0 goto missing_NLS_tools
770 -test -x /dev/env/DJDIR/bin/xgettext.exe
771 -if not errorlevel 0 goto missing_NLS_tools
772 -test -f /dev/env/DJDIR/include/libcharset.h
773 -if not errorlevel 0 goto missing_NLS_tools
774 -test -f /dev/env/DJDIR/lib/libcharset.a
775 -if not errorlevel 0 goto missing_NLS_tools
776 -test -f /dev/env/DJDIR/include/iconv.h
777 -if not errorlevel 0 goto missing_NLS_tools
778 -test -f /dev/env/DJDIR/lib/libiconv.a
779 -if not errorlevel 0 goto missing_NLS_tools
780 -test -f /dev/env/DJDIR/include/libintl.h
781 -if not errorlevel 0 goto missing_NLS_tools
782 -test -f /dev/env/DJDIR/lib/libintl.a
783 -if not errorlevel 0 goto missing_NLS_tools
784 -
785 -Rem Recreate the files in the %XSRC%/po subdir with our ported tools.
786 -redir -e /dev/null rm %XSRC%/po/*.gmo
787 -redir -e /dev/null rm %XSRC%/po/diffutil*.pot
788 -redir -e /dev/null rm %XSRC%/po/cat-id-tbl.c
789 -redir -e /dev/null rm %XSRC%/po/stamp-cat-id
790 -
791 -Rem Update the arguments file for the configure script.
792 -Rem We prefer without-included-gettext because libintl.a from gettext package
793 -Rem is the only one that is guaranteed to have been ported to DJGPP.
794 -echo --enable-nls --without-included-gettext >> arguments
795 -goto configure_package
796 -
797 -:missing_NLS_tools
798 -echo Needed libs/tools for NLS not found. Configuring without NLS.
799 -:without_NLS
800 -Rem Update the arguments file for the configure script.
801 -echo --disable-nls >> arguments
802 -
803 -:configure_package
804 -echo Running the ./configure script...
805 -sh ./configure @arguments
806 -if errorlevel 1 goto cfg_error
807 -rm arguments
808 -
809 -Rem Remove files created by the gl_FUNC_MKSTEMP test.
810 -rm co*.tmp
811 -echo Done.
812 -goto End
813 -
814 -:sed_error
815 -echo ./configure script editing failed!
816 -goto End
817 -
818 -:cfg_error
819 -echo ./configure script exited abnormally!
820 -goto End
821 -
822 -:small_env
823 -echo Your environment size is too small. Enlarge it and run me again.
824 -echo Configuration NOT done!
825 -
826 -:End
827 -test -f %XSRC%/install-sh.sh
828 -if not errorlevel 1 goto no_ren1
829 -test -f %XSRC%/install-sh
830 -if not errorlevel 1 mv -f %XSRC%/install-sh %XSRC%/install-sh.sh
831 -:no_ren1
832 -if "%HOME%" == "%XSRC%/djgpp" set HOME=
833 -set ARGS=
834 -set CONFIG_SITE=
835 -set HOSTNAME=
836 -set NLS=
837 -set CACHE=
838 -set DEPTRAK=
839 -set XSRC=
840 diff -rNU3 texinfo.orig/djgpp/config.sed texinfo/djgpp/config.sed
841 --- texinfo.orig/djgpp/config.sed 2004-12-15 15:59:22.000000000 +0100
842 +++ texinfo/djgpp/config.sed 1970-01-01 01:00:00.000000000 +0100
843 @@ -1,67 +0,0 @@
844 -# Additional editing of configure and Makefiles for DJGPP
845 -
846 -/(echo[ ]*':t/ a\
847 -# DJGPP specific Makefile changes.\
848 - /^aliaspath * *=/s,:,";",g;t t\
849 - /TEXINPUTS=/s,:,";",g;t t\
850 - /PATH=/s,:,";",g;t t\
851 - s,\\.deps,_deps,g;t t\
852 - s,\\.new\\.,_new.,g;t t\
853 - s,\\.old\\.,_old.,g;t t\
854 - s,\\.tab\\.,_tab.,g;t t\
855 - s,Makefile\\.in\\.in,Makefile.in-in,g;t t\
856 - s,Makefile\\.am\\.in,Makefile.am-in,g;t t\
857 - /^install-info-am:/,/^$/ {\
858 - /@list=.\\\$(INFO_DEPS)\[^ \]/s,DEPS),& texinf- texin- info-stn.i info.inf,\
859 - s,\\(\\\$\\\$d/\\\$\\\$file-\\[0-9\\]\\[0-9\\]\\)\\(\[^ \]\\),\\1 \\$\\$d/\\$\\$file[0-9] \\$\\$d/\\$\\$file[0-9][0-9]\\2,\
860 - s,\\( \\\$\\\$file-\\[0-9\\]\\[0-9\\]\\)\\(\[^ \]\\),\\1 \\$\\$file[0-9] \\$\\$file[0-9][0-9]\\2,\
861 - }\
862 - /^uninstall-info-am:/,/^$/ {\
863 - /@list=.\\\$(INFO_DEPS)\[^ \]/s,DEPS),& texinf- texin- info-stn.i info.inf,\
864 - s,\\(file-\\[0-9\\]\\[0-9\\]\\)\\(\[^ \]\\),\\1 \\$\\$file[0-9] \\$\\$file[0-9][0-9]\\2,\
865 - }
866 -
867 -# Makefile.in.in is renamed to Makefile.in-in.
868 -/ac_config_files=/,/_ACEOF/ {
869 - s|po/Makefile\.in|&:po/Makefile.in-in|
870 -}
871 -/CONFIG_FILES=/ s|po/Makefile\.in|&:po/Makefile.in-in|2
872 -
873 -# We always use _deps instead of .deps, because the latter is an
874 -# invalid name on 8+3 MS-DOS filesystem. This makes the generated
875 -# Makefiles good for every DJGPP installation, not only the one
876 -# where the package was configured (which could happen to be a
877 -# Windows box, where leading dots in file names are allowed).
878 -s,\.deps,_deps,g
879 -
880 -# The following two items are changes needed for configuring
881 -# and compiling across partitions.
882 -# The given srcdir value is always translated from the
883 -# "x:" syntax into "/dev/x" syntax while we run configure.
884 -/^[ ]*-srcdir=\*.*$/ a\
885 - ac_optarg=`echo "$ac_optarg" | sed "s,^\\([A-Za-z]\\):,/dev/\\1,"`
886 -/set X `ls -Lt \$srcdir/ i\
887 - if `echo $srcdir | grep "^/dev/" - > /dev/null`; then\
888 - srcdir=`echo "$srcdir" | sed -e "s%^/dev/%%" -e "s%/%:/%"`\
889 - fi
890 -
891 -# Autoconf 2.52e generated configure scripts
892 -# write absolute paths into Makefiles making
893 -# them useless for DJGPP installations for which
894 -# the package has not been configured for.
895 -/MISSING=/,/^$/ {
896 - /^fi$/ a\
897 -am_missing_run=`echo "$am_missing_run" | sed 's%/dev.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%;s%.:.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%'`
898 -}
899 -/^install_sh=/a\
900 -install_sh=`echo "$install_sh" | sed 's%/dev.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%;s%.:.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%'`
901 -
902 -# The following makes sure we are not going to remove a directory
903 -# which is the cwd on its drive (DOS doesn't allow to remove such
904 -# a directory). The trick is to chdir to the root directory on
905 -# temp directory's drive before removing $tmp.
906 -/^ *trap 'exit_status=\$\?; rm -rf/s%rm -rf%cd $tmp; cd /; &%
907 -
908 -# AC_CONFIG_LINKS fails if the source and destination are on
909 -# different file systems and symlinks don't work.
910 -/^ ln \$srcdir/s%||%|| cp -pf $srcdir/$ac_source $ac_dest ||%
911 diff -rNU3 texinfo.orig/djgpp/config.site texinfo/djgpp/config.site
912 --- texinfo.orig/djgpp/config.site 2002-09-27 00:01:10.000000000 +0200
913 +++ texinfo/djgpp/config.site 1970-01-01 01:00:00.000000000 +0100
914 @@ -1,53 +0,0 @@
915 -#! /bin/sh
916 -# Site defaults for the DJGPP configuration
917 -
918 -# These two variables are required, otherwise looking for
919 -# programs along the PATH will not work.
920 -PATH_SEPARATOR=:
921 -PATH_EXPAND=y
922 -
923 -# This is required in for "test -f foo" to find foo.exe.
924 -export TEST_FINDS_EXE=y
925 -
926 -# The root of the DJGPP tree serves as the default prefix
927 -# for all paths that are hardcoded in the binaries.
928 -# When installing the installation prefix must be supplied.
929 -test "x$prefix" = xNONE && prefix='/dev/env/DJDIR'
930 -
931 -# This is required for config.status script to be run, since
932 -# ./configure runs it by invoking ${CONFIG_SHELL-/bin/sh}
933 -# CONFIG_SHELL=${CONFIG_SHELL='sh'}
934 -
935 -# These are set here so the generated Makefile's will be good
936 -# for every DJGPP installation, not only the one where the
937 -# package was configured.
938 -# $INSTALL must be an absolute path name, otherwise config.status
939 -# will try to prepend ./ and ../ to it when it goes into subdirs.
940 -INSTALL=${INSTALL='/dev/env/DJDIR/bin/ginstall -c'}
941 -RANLIB=${RANLIB='ranlib'}
942 -GMSGFMT=${GMSGFMT='/dev/env/DJDIR/bin/msgfmt'}
943 -MSGFMT=${MSGFMT='/dev/env/DJDIR/bin/msgfmt'}
944 -XGETTEXT=${XGETTEXT='/dev/env/DJDIR/bin/xgettext'}
945 -
946 -# Sane defaults for standard programs used by the build process.
947 -# We force the values of these variables so that the resultant
948 -# Makefile's will work on any DJGPP platform, not only on the
949 -# machine where the package was configured.
950 -ac_cv_prog_AWK=${AWK='gawk'}
951 -ac_cv_prog_INTLBISON=${INTLBISON='bison'}
952 -ac_cv_prog_CC=${CC='gcc'}
953 -
954 -# These are set here so the generated libtool/Makefile's will
955 -# be good for every DJGPP installation, not only the one where
956 -# the package was configured.
957 -NM=${NM='nm'}
958 -LD=${LD='ld'}
959 -MAKEINFO=${MAKEINFO='makeinfo'}
960 -
961 -# Force the test for 'ln -s' to report 'cp -pf'.
962 -ac_cv_prog_LN_S='cp -pf'
963 -
964 -# We have `fork', but it always fails. Don't trust Autoconf to be
965 -# smart enough to detect that...
966 -ac_cv_func_fork=no
967 -ac_cv_func_vfork=no
968 diff -rNU3 texinfo.orig/doc/Makefile.am texinfo/doc/Makefile.am
969 --- texinfo.orig/doc/Makefile.am 2004-11-18 02:10:59.000000000 +0100
970 +++ texinfo/doc/Makefile.am 2015-10-18 11:13:23.000000000 +0200
971 @@ -1,4 +1,4 @@
972 -# $Id: Makefile.am,v 1.20 2004/11/18 01:10:59 karl Exp $
973 +# Id: Makefile.am,v 1.20 2004/11/18 01:10:59 karl Exp
974 # Makefile.am for texinfo/doc.
975 # Run automake in .. to produce Makefile.in from this.
976 #
977 diff -rNU3 texinfo.orig/doc/Makefile.in texinfo/doc/Makefile.in
978 --- texinfo.orig/doc/Makefile.in 2004-12-31 19:01:47.000000000 +0100
979 +++ texinfo/doc/Makefile.in 2015-10-18 11:13:23.000000000 +0200
980 @@ -14,7 +14,7 @@
982 @SET_MAKE@
984 -# $Id: Makefile.am,v 1.20 2004/11/18 01:10:59 karl Exp $
985 +# Id: Makefile.am,v 1.20 2004/11/18 01:10:59 karl Exp
986 # Makefile.am for texinfo/doc.
987 # Run automake in .. to produce Makefile.in from this.
988 #
989 diff -rNU3 texinfo.orig/doc/README texinfo/doc/README
990 --- texinfo.orig/doc/README 2004-04-11 19:56:45.000000000 +0200
991 +++ texinfo/doc/README 2015-10-18 11:13:23.000000000 +0200
992 @@ -1,4 +1,4 @@
993 -$Id: README,v 1.4 2004/04/11 17:56:45 karl Exp $
994 +Id: README,v 1.4 2004/04/11 17:56:45 karl Exp
995 texinfo/doc/README
997 Copyright (C) 2002 Free Software Foundation, Inc.
998 diff -rNU3 texinfo.orig/doc/fdl.texi texinfo/doc/fdl.texi
999 --- texinfo.orig/doc/fdl.texi 2003-03-19 02:29:34.000000000 +0100
1000 +++ texinfo/doc/fdl.texi 2015-10-18 11:13:23.000000000 +0200
1001 @@ -1,4 +1,5 @@
1003 +@c $NetBSD: fdl.texi,v 1.1.1.3 2003/07/03 14:58:45 wiz Exp $
1004 @node GNU Free Documentation License
1005 @appendixsec GNU Free Documentation License
1007 diff -rNU3 texinfo.orig/doc/info-stnd.texi texinfo/doc/info-stnd.texi
1008 --- texinfo.orig/doc/info-stnd.texi 2004-12-14 17:58:15.000000000 +0100
1009 +++ texinfo/doc/info-stnd.texi 2015-10-18 11:13:23.000000000 +0200
1010 @@ -1,5 +1,6 @@
1011 \input texinfo.tex @c -*-texinfo-*-
1012 -@comment $Id: info-stnd.texi,v 1.9 2004/12/14 16:58:15 karl Exp $
1013 +@c $NetBSD: info-stnd.texi,v 1.1.1.6 2008/09/02 07:51:41 christos Exp $
1014 +@comment Id: info-stnd.texi,v 1.9 2004/12/14 16:58:15 karl Exp
1015 @c We must \input texinfo.tex instead of texinfo, otherwise make
1016 @c distcheck in the Texinfo distribution fails, because the texinfo Info
1017 @c file is made first, and texi2dvi must include . first in the path.
1018 diff -rNU3 texinfo.orig/doc/info.1 texinfo/doc/info.1
1019 --- texinfo.orig/doc/info.1 2004-12-31 19:02:15.000000000 +0100
1020 +++ texinfo/doc/info.1 2015-10-18 11:13:23.000000000 +0200
1021 @@ -1,3 +1,5 @@
1022 +.\" $NetBSD: info.1,v 1.1.1.6 2008/09/02 07:51:56 christos Exp $
1023 +.\"
1024 .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.34.
1025 .TH INFO "1" "December 2004" "info 4.8" "User Commands"
1026 .SH NAME
1027 diff -rNU3 texinfo.orig/doc/info.5 texinfo/doc/info.5
1028 --- texinfo.orig/doc/info.5 2004-04-11 19:56:45.000000000 +0200
1029 +++ texinfo/doc/info.5 2015-10-18 11:13:23.000000000 +0200
1030 @@ -1,5 +1,7 @@
1031 +.\" $NetBSD: info.5,v 1.1.1.4 2008/09/02 07:51:56 christos Exp $
1032 +.\"
1033 .\" info(5)
1034 -.\" $Id: info.5,v 1.2 2004/04/11 17:56:45 karl Exp $
1035 +.\" Id: info.5,v 1.2 2004/04/11 17:56:45 karl Exp
1036 .\"
1037 .\" Copyright (C) 1998 Free Software Foundation, Inc.
1038 .\"
1039 diff -rNU3 texinfo.orig/doc/info.texi texinfo/doc/info.texi
1040 --- texinfo.orig/doc/info.texi 2004-10-06 23:29:48.000000000 +0200
1041 +++ texinfo/doc/info.texi 2015-10-18 11:13:23.000000000 +0200
1042 @@ -1,4 +1,5 @@
1043 \input texinfo.tex @c -*-texinfo-*-
1044 +@c $NetBSD: info.texi,v 1.1.1.5 2008/09/02 07:51:43 christos Exp $
1045 @c We must \input texinfo.tex instead of texinfo, otherwise make
1046 @c distcheck in the Texinfo distribution fails, because the texinfo Info
1047 @c file is made first, and texi2dvi must include . first in the path.
1048 diff -rNU3 texinfo.orig/doc/infokey.1 texinfo/doc/infokey.1
1049 --- texinfo.orig/doc/infokey.1 2004-12-31 19:02:16.000000000 +0100
1050 +++ texinfo/doc/infokey.1 2015-10-18 11:13:23.000000000 +0200
1051 @@ -1,3 +1,5 @@
1052 +.\" $NetBSD: infokey.1,v 1.1.1.2 2008/09/02 07:51:56 christos Exp $
1053 +.\"
1054 .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.34.
1055 .TH INFOKEY "1" "December 2004" "infokey 4.8" "User Commands"
1056 .SH NAME
1057 diff -rNU3 texinfo.orig/doc/install-info.1 texinfo/doc/install-info.1
1058 --- texinfo.orig/doc/install-info.1 2004-12-31 19:02:16.000000000 +0100
1059 +++ texinfo/doc/install-info.1 2015-10-18 11:13:23.000000000 +0200
1060 @@ -1,3 +1,5 @@
1061 +.\" $NetBSD: install-info.1,v 1.1.1.6 2008/09/02 07:51:46 christos Exp $
1062 +.\"
1063 .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.34.
1064 .TH INSTALL-INFO "1" "December 2004" "install-info 4.8" "User Commands"
1065 .SH NAME
1066 diff -rNU3 texinfo.orig/doc/makeinfo.1 texinfo/doc/makeinfo.1
1067 --- texinfo.orig/doc/makeinfo.1 2004-12-31 19:02:16.000000000 +0100
1068 +++ texinfo/doc/makeinfo.1 2015-10-18 11:13:23.000000000 +0200
1069 @@ -1,3 +1,5 @@
1070 +.\" $NetBSD: makeinfo.1,v 1.2 2009/02/28 19:14:15 joerg Exp $
1071 +.\"
1072 .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.34.
1073 .TH MAKEINFO "1" "December 2004" "makeinfo 4.8" "User Commands"
1074 .SH NAME
1075 @@ -62,6 +64,9 @@
1076 suppress splitting of Info or HTML output,
1077 generate only one output file.
1078 .TP
1079 +\fB\-\-no\-version\-header\fR
1080 +suppress header with makeinfo version and source path.
1081 +.TP
1082 \fB\-\-number\-sections\fR
1083 output chapter and sectioning numbers.
1084 .TP
1085 diff -rNU3 texinfo.orig/doc/texi2dvi.1 texinfo/doc/texi2dvi.1
1086 --- texinfo.orig/doc/texi2dvi.1 2004-12-31 19:03:11.000000000 +0100
1087 +++ texinfo/doc/texi2dvi.1 2015-10-18 11:13:23.000000000 +0200
1088 @@ -1,3 +1,5 @@
1089 +.\" $NetBSD: texi2dvi.1,v 1.1.1.6 2008/09/02 07:51:56 christos Exp $
1090 +.\"
1091 .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.34.
1092 .TH TEXI2DVI "1" "December 2004" "texi2dvi 1.34" "User Commands"
1093 .SH NAME
1094 diff -rNU3 texinfo.orig/doc/texindex.1 texinfo/doc/texindex.1
1095 --- texinfo.orig/doc/texindex.1 2004-12-31 19:02:16.000000000 +0100
1096 +++ texinfo/doc/texindex.1 2015-10-18 11:13:23.000000000 +0200
1097 @@ -1,3 +1,5 @@
1098 +.\" $NetBSD: texindex.1,v 1.3 2008/09/02 08:00:24 christos Exp $
1099 +.\"
1100 .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.34.
1101 .TH TEXINDEX "1" "December 2004" "texindex 4.8" "User Commands"
1102 .SH NAME
1103 @@ -13,12 +15,6 @@
1104 \fB\-h\fR, \fB\-\-help\fR
1105 display this help and exit
1106 .TP
1107 -\fB\-k\fR, \fB\-\-keep\fR
1108 -keep temporary files around after processing
1109 -.TP
1110 -\fB\-\-no\-keep\fR
1111 -do not keep temporary files around after processing (default)
1112 -.TP
1113 \fB\-o\fR, \fB\-\-output\fR FILE
1114 send output to FILE
1115 .TP
1116 diff -rNU3 texinfo.orig/doc/texinfo.5 texinfo/doc/texinfo.5
1117 --- texinfo.orig/doc/texinfo.5 2004-04-11 19:56:45.000000000 +0200
1118 +++ texinfo/doc/texinfo.5 2015-10-18 11:13:23.000000000 +0200
1119 @@ -1,5 +1,7 @@
1120 +.\" $NetBSD: texinfo.5,v 1.1.1.4 2008/09/02 07:51:56 christos Exp $
1121 +.\"
1122 .\" texinfo(5)
1123 -.\" $Id: texinfo.5,v 1.2 2004/04/11 17:56:45 karl Exp $
1124 +.\" Id: texinfo.5,v 1.2 2004/04/11 17:56:45 karl Exp
1125 .\"
1126 .\" Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
1127 .\"
1128 diff -rNU3 texinfo.orig/doc/texinfo.txi texinfo/doc/texinfo.txi
1129 --- texinfo.orig/doc/texinfo.txi 2004-12-29 16:06:41.000000000 +0100
1130 +++ texinfo/doc/texinfo.txi 2015-10-18 11:13:23.000000000 +0200
1131 @@ -1,5 +1,5 @@
1132 \input texinfo.tex @c -*-texinfo-*-
1133 -@c $Id: texinfo.txi,v 1.128 2004/12/29 15:06:41 karl Exp $
1134 +@c Id: texinfo.txi,v 1.128 2004/12/29 15:06:41 karl Exp
1135 @c Ordinarily, Texinfo files have the extension .texi. But texinfo.texi
1136 @c clashes with texinfo.tex on 8.3 filesystems, so we use texinfo.txi.
1138 @@ -12782,7 +12782,7 @@
1140 @table @code
1141 @item @@set @var{flag} [@var{value}]
1142 -Set the variable @var{flag}, to the optional @var{value} if specifed.
1143 +Set the variable @var{flag}, to the optional @var{value} if specified.
1145 @item @@clear @var{flag}
1146 Undefine the variable @var{flag}, whether or not it was previously defined.
1147 @@ -18451,7 +18451,7 @@
1148 Concurrent Versions System}) or RCS (see rcsintro(1)) version control
1149 systems, which expand it into a string such as:
1150 @example
1151 -$Id: texinfo.txi,v 1.128 2004/12/29 15:06:41 karl Exp $
1152 +Id: texinfo.txi,v 1.128 2004/12/29 15:06:41 karl Exp
1153 @end example
1154 (This is useful in all sources that use version control, not just manuals.)
1155 You may wish to include the @samp{$Id:} comment in the @code{@@copying}
1156 @@ -18517,7 +18517,7 @@
1158 @verbatim
1159 \input texinfo @c -*-texinfo-*-
1160 -@comment $Id: texinfo.txi,v 1.128 2004/12/29 15:06:41 karl Exp $
1161 +@comment Id: texinfo.txi,v 1.128 2004/12/29 15:06:41 karl Exp
1162 @comment %**start of header
1163 @setfilename sample.info
1164 @include version.texi
1165 diff -rNU3 texinfo.orig/doc/txi-cs.tex texinfo/doc/txi-cs.tex
1166 --- texinfo.orig/doc/txi-cs.tex 2004-04-11 19:56:45.000000000 +0200
1167 +++ texinfo/doc/txi-cs.tex 2015-10-18 11:13:23.000000000 +0200
1168 @@ -1,4 +1,4 @@
1169 -% $Id: txi-cs.tex,v 1.3 2004/04/11 17:56:45 karl Exp $
1170 +% Id: txi-cs.tex,v 1.3 2004/04/11 17:56:45 karl Exp
1171 % Czech translation for texinfo.tex.
1172 %
1173 % Copyright (C) 1999, 2000 Free Software Foundation.
1174 diff -rNU3 texinfo.orig/doc/txi-de.tex texinfo/doc/txi-de.tex
1175 --- texinfo.orig/doc/txi-de.tex 2004-04-11 19:56:45.000000000 +0200
1176 +++ texinfo/doc/txi-de.tex 2015-10-18 11:13:23.000000000 +0200
1177 @@ -1,5 +1,5 @@
1178 % txi-de.tex -- adaptation to German for texinfo.tex.
1179 -% $Id: txi-de.tex,v 1.3 2004/04/11 17:56:45 karl Exp $
1180 +% Id: txi-de.tex,v 1.3 2004/04/11 17:56:45 karl Exp
1181 %
1182 % Copyright (C) 1999 Free Software Foundation, Inc.
1183 %
1184 diff -rNU3 texinfo.orig/doc/txi-en.tex texinfo/doc/txi-en.tex
1185 --- texinfo.orig/doc/txi-en.tex 2004-04-11 19:56:45.000000000 +0200
1186 +++ texinfo/doc/txi-en.tex 2015-10-18 11:13:23.000000000 +0200
1187 @@ -1,7 +1,7 @@
1188 % English non-translation for texinfo.tex. This is read when a source
1189 % document says @documentlanguage en (which might happen after another
1190 % @documentlanguage). The actual values are the same as defaults.
1191 -% $Id: txi-en.tex,v 1.3 2004/04/11 17:56:45 karl Exp $
1192 +% Id: txi-en.tex,v 1.3 2004/04/11 17:56:45 karl Exp
1193 %
1194 % Copyright (C) 1999 Free Software Foundation.
1195 %
1196 diff -rNU3 texinfo.orig/doc/txi-fr.tex texinfo/doc/txi-fr.tex
1197 --- texinfo.orig/doc/txi-fr.tex 2004-04-11 19:56:45.000000000 +0200
1198 +++ texinfo/doc/txi-fr.tex 2015-10-18 11:13:23.000000000 +0200
1199 @@ -1,5 +1,5 @@
1200 % txi-fr.tex -- TeX macros to handle French language for texinfo.tex documents.
1201 -% $Id: txi-fr.tex,v 1.3 2004/04/11 17:56:45 karl Exp $
1202 +% Id: txi-fr.tex,v 1.3 2004/04/11 17:56:45 karl Exp
1203 %
1204 % Copyright (C) 1999 Free Software Foundation.
1205 %
1206 diff -rNU3 texinfo.orig/doc/txi-it.tex texinfo/doc/txi-it.tex
1207 --- texinfo.orig/doc/txi-it.tex 2004-04-11 19:56:45.000000000 +0200
1208 +++ texinfo/doc/txi-it.tex 2015-10-18 11:13:23.000000000 +0200
1209 @@ -1,7 +1,7 @@
1210 % English non-translation for texinfo.tex. This is read when a source
1211 % document says @documentlanguage en (which might happen after another
1212 % @documentlanguage). The actual values are the same as defaults.
1213 -% $Id: txi-it.tex,v 1.3 2004/04/11 17:56:45 karl Exp $
1214 +% Id: txi-it.tex,v 1.3 2004/04/11 17:56:45 karl Exp
1215 %
1216 % Copyright (C) 1999 Free Software Foundation.
1217 %
1218 diff -rNU3 texinfo.orig/doc/txi-nl.tex texinfo/doc/txi-nl.tex
1219 --- texinfo.orig/doc/txi-nl.tex 2004-04-11 19:56:45.000000000 +0200
1220 +++ texinfo/doc/txi-nl.tex 2015-10-18 11:13:23.000000000 +0200
1221 @@ -1,5 +1,5 @@
1222 % Dutch translation for texinfo.tex.
1223 -% $Id: txi-nl.tex,v 1.3 2004/04/11 17:56:45 karl Exp $
1224 +% Id: txi-nl.tex,v 1.3 2004/04/11 17:56:45 karl Exp
1225 %
1226 % Copyright (C) 1999 Free Software Foundation.
1227 %
1228 diff -rNU3 texinfo.orig/doc/txi-pl.tex texinfo/doc/txi-pl.tex
1229 --- texinfo.orig/doc/txi-pl.tex 2004-04-11 19:56:45.000000000 +0200
1230 +++ texinfo/doc/txi-pl.tex 2015-10-18 11:13:23.000000000 +0200
1231 @@ -1,5 +1,5 @@
1232 % txi-pl.tex -- adaptation to Polish for texinfo.tex.
1233 -% $Id: txi-pl.tex,v 1.3 2004/04/11 17:56:45 karl Exp $
1234 +% Id: txi-pl.tex,v 1.3 2004/04/11 17:56:45 karl Exp
1235 %
1236 % Copyright (C) 2003 Free Software Foundation.
1237 %
1238 diff -rNU3 texinfo.orig/doc/txi-tr.tex texinfo/doc/txi-tr.tex
1239 --- texinfo.orig/doc/txi-tr.tex 2004-04-11 19:56:45.000000000 +0200
1240 +++ texinfo/doc/txi-tr.tex 2015-10-18 11:13:23.000000000 +0200
1241 @@ -1,5 +1,5 @@
1242 % txi-en.tex -- adaptation to Turkish for texinfo.tex.
1243 -% $Id: txi-tr.tex,v 1.3 2004/04/11 17:56:45 karl Exp $
1244 +% Id: txi-tr.tex,v 1.3 2004/04/11 17:56:45 karl Exp
1245 %
1246 % Copyright (C) 2003 Free Software Foundation, Inc.
1247 %
1248 diff -rNU3 texinfo.orig/doc/version-stnd.texi texinfo/doc/version-stnd.texi
1249 --- texinfo.orig/doc/version-stnd.texi 2004-12-31 19:02:15.000000000 +0100
1250 +++ texinfo/doc/version-stnd.texi 2015-10-18 11:13:23.000000000 +0200
1251 @@ -1,4 +1,5 @@
1252 @set UPDATED 14 December 2004
1253 +@c $NetBSD: version-stnd.texi,v 1.1.1.5 2008/09/02 07:51:36 christos Exp $
1254 @set UPDATED-MONTH December 2004
1255 @set EDITION 4.8
1256 @set VERSION 4.8
1257 diff -rNU3 texinfo.orig/doc/version.texi texinfo/doc/version.texi
1258 --- texinfo.orig/doc/version.texi 2004-12-31 19:02:15.000000000 +0100
1259 +++ texinfo/doc/version.texi 2015-10-18 11:13:23.000000000 +0200
1260 @@ -1,4 +1,5 @@
1261 @set UPDATED 29 December 2004
1262 +@c $NetBSD: version.texi,v 1.1.1.6 2008/09/02 07:51:46 christos Exp $
1263 @set UPDATED-MONTH December 2004
1264 @set EDITION 4.8
1265 @set VERSION 4.8
1266 diff -rNU3 texinfo.orig/info/Makefile.am texinfo/info/Makefile.am
1267 --- texinfo.orig/info/Makefile.am 2004-10-28 16:03:27.000000000 +0200
1268 +++ texinfo/info/Makefile.am 2015-10-18 11:13:23.000000000 +0200
1269 @@ -1,4 +1,4 @@
1270 -# $Id: Makefile.am,v 1.8 2004/10/28 14:03:27 karl Exp $
1271 +# Id: Makefile.am,v 1.8 2004/10/28 14:03:27 karl Exp
1272 # Makefile.am for texinfo/info.
1273 # Run automake in .. to produce Makefile.in from this.
1274 #
1275 diff -rNU3 texinfo.orig/info/Makefile.in texinfo/info/Makefile.in
1276 --- texinfo.orig/info/Makefile.in 2004-12-31 19:01:48.000000000 +0100
1277 +++ texinfo/info/Makefile.in 2015-10-18 11:13:23.000000000 +0200
1278 @@ -14,7 +14,7 @@
1280 @SET_MAKE@
1282 -# $Id: Makefile.am,v 1.8 2004/10/28 14:03:27 karl Exp $
1283 +# Id: Makefile.am,v 1.8 2004/10/28 14:03:27 karl Exp
1284 # Makefile.am for texinfo/info.
1285 # Run automake in .. to produce Makefile.in from this.
1286 #
1287 diff -rNU3 texinfo.orig/info/README texinfo/info/README
1288 --- texinfo.orig/info/README 2004-04-11 19:56:45.000000000 +0200
1289 +++ texinfo/info/README 2015-10-18 11:13:23.000000000 +0200
1290 @@ -1,4 +1,4 @@
1291 -$Id: README,v 1.3 2004/04/11 17:56:45 karl Exp $
1292 +Id: README,v 1.3 2004/04/11 17:56:45 karl Exp
1293 texinfo/info/README
1295 Copyright (C) 2002 Free Software Foundation, Inc.
1296 diff -rNU3 texinfo.orig/info/dir.c texinfo/info/dir.c
1297 --- texinfo.orig/info/dir.c 2004-04-11 19:56:45.000000000 +0200
1298 +++ texinfo/info/dir.c 2015-10-18 11:13:23.000000000 +0200
1299 @@ -1,5 +1,7 @@
1300 +/* $NetBSD: dir.c,v 1.1.1.5 2008/09/02 07:49:33 christos Exp $ */
1301 +
1302 /* dir.c -- how to build a special "dir" node from "localdir" files.
1303 - $Id: dir.c,v 1.3 2004/04/11 17:56:45 karl Exp $
1304 + Id: dir.c,v 1.3 2004/04/11 17:56:45 karl Exp
1306 Copyright (C) 1993, 1997, 1998, 2004 Free Software Foundation, Inc.
1308 diff -rNU3 texinfo.orig/info/display.c texinfo/info/display.c
1309 --- texinfo.orig/info/display.c 2004-04-11 19:56:45.000000000 +0200
1310 +++ texinfo/info/display.c 2015-10-18 11:13:23.000000000 +0200
1311 @@ -1,5 +1,7 @@
1312 +/* $NetBSD: display.c,v 1.1.1.5 2008/09/02 07:49:34 christos Exp $ */
1313 +
1314 /* display.c -- How to display Info windows.
1315 - $Id: display.c,v 1.7 2004/04/11 17:56:45 karl Exp $
1316 + Id: display.c,v 1.7 2004/04/11 17:56:45 karl Exp
1318 Copyright (C) 1993, 1997, 2003, 2004 Free Software Foundation, Inc.
1320 diff -rNU3 texinfo.orig/info/display.h texinfo/info/display.h
1321 --- texinfo.orig/info/display.h 2004-04-11 19:56:45.000000000 +0200
1322 +++ texinfo/info/display.h 2015-10-18 11:13:23.000000000 +0200
1323 @@ -1,5 +1,7 @@
1324 +/* $NetBSD: display.h,v 1.1.1.4 2008/09/02 07:49:34 christos Exp $ */
1325 +
1326 /* display.h -- How the display in Info is done.
1327 - $Id: display.h,v 1.3 2004/04/11 17:56:45 karl Exp $
1328 + Id: display.h,v 1.3 2004/04/11 17:56:45 karl Exp
1330 This file is part of GNU Info, a program for reading online documentation
1331 stored in Info format.
1332 diff -rNU3 texinfo.orig/info/doc.h texinfo/info/doc.h
1333 --- texinfo.orig/info/doc.h 2004-04-11 19:56:45.000000000 +0200
1334 +++ texinfo/info/doc.h 2015-10-18 11:13:23.000000000 +0200
1335 @@ -1,5 +1,7 @@
1336 +/* $NetBSD: doc.h,v 1.1.1.4 2008/09/02 07:49:34 christos Exp $ */
1337 +
1338 /* doc.h -- Structures associating function pointers with documentation.
1339 - $Id: doc.h,v 1.3 2004/04/11 17:56:45 karl Exp $
1340 + Id: doc.h,v 1.3 2004/04/11 17:56:45 karl Exp
1342 Copyright (C) 1993, 2001, 2004 Free Software Foundation, Inc.
1344 diff -rNU3 texinfo.orig/info/dribble.c texinfo/info/dribble.c
1345 --- texinfo.orig/info/dribble.c 2004-04-11 19:56:45.000000000 +0200
1346 +++ texinfo/info/dribble.c 2015-10-18 11:13:23.000000000 +0200
1347 @@ -1,5 +1,7 @@
1348 +/* $NetBSD: dribble.c,v 1.1.1.5 2008/09/02 07:49:34 christos Exp $ */
1349 +
1350 /* dribble.c -- dribble files for Info.
1351 - $Id: dribble.c,v 1.3 2004/04/11 17:56:45 karl Exp $
1352 + Id: dribble.c,v 1.3 2004/04/11 17:56:45 karl Exp
1354 Copyright (C) 1993, 1998, 2004 Free Software Foundation, Inc.
1356 diff -rNU3 texinfo.orig/info/dribble.h texinfo/info/dribble.h
1357 --- texinfo.orig/info/dribble.h 2004-04-11 19:56:45.000000000 +0200
1358 +++ texinfo/info/dribble.h 2015-10-18 11:13:23.000000000 +0200
1359 @@ -1,3 +1,5 @@
1360 +/* $NetBSD: dribble.h,v 1.1.1.3 2004/07/12 23:26:56 wiz Exp $ */
1361 +
1362 /* dribble.h -- Functions and vars declared in dribble.c. */
1364 /* This file is part of GNU Info, a program for reading online documentation
1365 diff -rNU3 texinfo.orig/info/echo-area.c texinfo/info/echo-area.c
1366 --- texinfo.orig/info/echo-area.c 2004-12-14 01:15:36.000000000 +0100
1367 +++ texinfo/info/echo-area.c 2015-10-18 11:13:23.000000000 +0200
1368 @@ -1,5 +1,7 @@
1369 +/* $NetBSD: echo-area.c,v 1.4 2008/09/02 08:41:51 christos Exp $ */
1370 +
1371 /* echo-area.c -- how to read a line in the echo area.
1372 - $Id: echo-area.c,v 1.7 2004/12/14 00:15:36 karl Exp $
1373 + Id: echo-area.c,v 1.7 2004/12/14 00:15:36 karl Exp
1375 Copyright (C) 1993, 1997, 1998, 1999, 2001, 2004 Free Software
1376 Foundation, Inc.
1377 @@ -936,7 +938,7 @@
1378 printf_to_message_buffer (completions_found_index == 1
1379 ? (char *) _("One completion:\n")
1380 : (char *) _("%d completions:\n"),
1381 - (void *) (long) completions_found_index,
1382 + (void*)((intptr_t)completions_found_index),
1383 NULL, NULL);
1385 /* Find the maximum length of a label. */
1386 diff -rNU3 texinfo.orig/info/echo-area.h texinfo/info/echo-area.h
1387 --- texinfo.orig/info/echo-area.h 2004-08-08 00:03:08.000000000 +0200
1388 +++ texinfo/info/echo-area.h 2015-10-18 11:13:23.000000000 +0200
1389 @@ -1,5 +1,7 @@
1390 +/* $NetBSD: echo-area.h,v 1.1.1.4 2008/09/02 07:49:37 christos Exp $ */
1391 +
1392 /* echo-area.h -- Functions used in reading information from the echo area.
1393 - $Id: echo-area.h,v 1.4 2004/08/07 22:03:08 karl Exp $
1394 + Id: echo-area.h,v 1.4 2004/08/07 22:03:08 karl Exp
1396 This file is part of GNU Info, a program for reading online documentation
1397 stored in Info format.
1398 diff -rNU3 texinfo.orig/info/filesys.c texinfo/info/filesys.c
1399 --- texinfo.orig/info/filesys.c 2004-07-30 19:17:40.000000000 +0200
1400 +++ texinfo/info/filesys.c 2015-10-18 11:13:23.000000000 +0200
1401 @@ -1,5 +1,7 @@
1402 +/* $NetBSD: filesys.c,v 1.1.1.6 2008/09/02 07:49:37 christos Exp $ */
1403 +
1404 /* filesys.c -- filesystem specific functions.
1405 - $Id: filesys.c,v 1.6 2004/07/30 17:17:40 karl Exp $
1406 + Id: filesys.c,v 1.6 2004/07/30 17:17:40 karl Exp
1408 Copyright (C) 1993, 1997, 1998, 2000, 2002, 2003, 2004 Free Software
1409 Foundation, Inc.
1410 diff -rNU3 texinfo.orig/info/filesys.h texinfo/info/filesys.h
1411 --- texinfo.orig/info/filesys.h 2004-04-11 19:56:45.000000000 +0200
1412 +++ texinfo/info/filesys.h 2015-10-18 11:13:23.000000000 +0200
1413 @@ -1,5 +1,7 @@
1414 +/* $NetBSD: filesys.h,v 1.1.1.5 2008/09/02 07:49:38 christos Exp $ */
1415 +
1416 /* filesys.h -- external declarations for filesys.c.
1417 - $Id: filesys.h,v 1.3 2004/04/11 17:56:45 karl Exp $
1418 + Id: filesys.h,v 1.3 2004/04/11 17:56:45 karl Exp
1420 Copyright (C) 1993, 1997, 1998, 2002, 2004 Free Software Foundation, Inc.
1422 diff -rNU3 texinfo.orig/info/footnotes.c texinfo/info/footnotes.c
1423 --- texinfo.orig/info/footnotes.c 2004-04-11 19:56:45.000000000 +0200
1424 +++ texinfo/info/footnotes.c 2015-10-18 11:13:23.000000000 +0200
1425 @@ -1,5 +1,7 @@
1426 +/* $NetBSD: footnotes.c,v 1.1.1.5 2008/09/02 07:49:38 christos Exp $ */
1427 +
1428 /* footnotes.c -- Some functions for manipulating footnotes.
1429 - $Id: footnotes.c,v 1.4 2004/04/11 17:56:45 karl Exp $
1430 + Id: footnotes.c,v 1.4 2004/04/11 17:56:45 karl Exp
1432 Copyright (C) 1993, 1997, 1998, 1999, 2002, 2004 Free Software
1433 Foundation, Inc.
1434 diff -rNU3 texinfo.orig/info/footnotes.h texinfo/info/footnotes.h
1435 --- texinfo.orig/info/footnotes.h 2004-04-11 19:56:45.000000000 +0200
1436 +++ texinfo/info/footnotes.h 2015-10-18 11:13:23.000000000 +0200
1437 @@ -1,5 +1,7 @@
1438 +/* $NetBSD: footnotes.h,v 1.1.1.5 2008/09/02 07:49:38 christos Exp $ */
1439 +
1440 /* footnotes.h -- Some functions for manipulating footnotes.
1441 - $Id: footnotes.h,v 1.3 2004/04/11 17:56:45 karl Exp $
1442 + Id: footnotes.h,v 1.3 2004/04/11 17:56:45 karl Exp
1444 Copyright (C) 1993, 1997, 1998, 2002, 2004 Free Software Foundation, Inc.
1446 diff -rNU3 texinfo.orig/info/gc.c texinfo/info/gc.c
1447 --- texinfo.orig/info/gc.c 2004-04-11 19:56:45.000000000 +0200
1448 +++ texinfo/info/gc.c 2015-10-18 11:13:23.000000000 +0200
1449 @@ -1,5 +1,7 @@
1450 +/* $NetBSD: gc.c,v 1.1.1.4 2008/09/02 07:49:38 christos Exp $ */
1451 +
1452 /* gc.c -- Functions to remember and garbage collect unused node contents.
1453 - $Id: gc.c,v 1.3 2004/04/11 17:56:45 karl Exp $
1454 + Id: gc.c,v 1.3 2004/04/11 17:56:45 karl Exp
1456 Copyright (C) 1993, 2004 Free Software Foundation, Inc.
1458 diff -rNU3 texinfo.orig/info/gc.h texinfo/info/gc.h
1459 --- texinfo.orig/info/gc.h 2004-04-11 19:56:45.000000000 +0200
1460 +++ texinfo/info/gc.h 2015-10-18 11:13:23.000000000 +0200
1461 @@ -1,5 +1,7 @@
1462 +/* $NetBSD: gc.h,v 1.1.1.4 2008/09/02 07:49:38 christos Exp $ */
1463 +
1464 /* gc.h -- Functions for garbage collecting unused node contents.
1465 - $Id: gc.h,v 1.3 2004/04/11 17:56:45 karl Exp $
1466 + Id: gc.h,v 1.3 2004/04/11 17:56:45 karl Exp
1468 This file is part of GNU Info, a program for reading online documentation
1469 stored in Info format.
1470 diff -rNU3 texinfo.orig/info/indices.c texinfo/info/indices.c
1471 --- texinfo.orig/info/indices.c 2004-04-11 19:56:45.000000000 +0200
1472 +++ texinfo/info/indices.c 2015-10-18 11:13:23.000000000 +0200
1473 @@ -1,5 +1,7 @@
1474 +/* $NetBSD: indices.c,v 1.1.1.6 2008/09/02 07:49:40 christos Exp $ */
1475 +
1476 /* indices.c -- deal with an Info file index.
1477 - $Id: indices.c,v 1.5 2004/04/11 17:56:45 karl Exp $
1478 + Id: indices.c,v 1.5 2004/04/11 17:56:45 karl Exp
1480 Copyright (C) 1993, 1997, 1998, 1999, 2002, 2003, 2004 Free Software
1481 Foundation, Inc.
1482 diff -rNU3 texinfo.orig/info/indices.h texinfo/info/indices.h
1483 --- texinfo.orig/info/indices.h 2004-04-11 19:56:45.000000000 +0200
1484 +++ texinfo/info/indices.h 2015-10-18 11:13:23.000000000 +0200
1485 @@ -1,5 +1,7 @@
1486 +/* $NetBSD: indices.h,v 1.1.1.4 2008/09/02 07:49:40 christos Exp $ */
1487 +
1488 /* indices.h -- Functions defined in indices.c.
1489 - $Id: indices.h,v 1.3 2004/04/11 17:56:45 karl Exp $
1490 + Id: indices.h,v 1.3 2004/04/11 17:56:45 karl Exp
1492 This file is part of GNU Info, a program for reading online documentation
1493 stored in Info format.
1494 diff -rNU3 texinfo.orig/info/info-utils.c texinfo/info/info-utils.c
1495 --- texinfo.orig/info/info-utils.c 2004-04-11 19:56:45.000000000 +0200
1496 +++ texinfo/info/info-utils.c 2015-10-18 11:13:23.000000000 +0200
1497 @@ -1,5 +1,7 @@
1498 +/* $NetBSD: info-utils.c,v 1.1.1.6 2008/09/02 07:49:40 christos Exp $ */
1499 +
1500 /* info-utils.c -- miscellanous.
1501 - $Id: info-utils.c,v 1.4 2004/04/11 17:56:45 karl Exp $
1502 + Id: info-utils.c,v 1.4 2004/04/11 17:56:45 karl Exp
1504 Copyright (C) 1993, 1998, 2003, 2004 Free Software Foundation, Inc.
1506 diff -rNU3 texinfo.orig/info/info-utils.h texinfo/info/info-utils.h
1507 --- texinfo.orig/info/info-utils.h 2004-04-11 19:56:45.000000000 +0200
1508 +++ texinfo/info/info-utils.h 2015-10-18 11:13:23.000000000 +0200
1509 @@ -1,5 +1,7 @@
1510 +/* $NetBSD: info-utils.h,v 1.1.1.6 2008/09/02 07:49:40 christos Exp $ */
1511 +
1512 /* info-utils.h -- Exported functions and variables from info-utils.c.
1513 - $Id: info-utils.h,v 1.4 2004/04/11 17:56:45 karl Exp $
1514 + Id: info-utils.h,v 1.4 2004/04/11 17:56:45 karl Exp
1516 Copyright (C) 1993, 1996, 1998, 2002, 2003, 2004 Free Software
1517 Foundation, Inc.
1518 diff -rNU3 texinfo.orig/info/info.c texinfo/info/info.c
1519 --- texinfo.orig/info/info.c 2004-04-11 19:56:45.000000000 +0200
1520 +++ texinfo/info/info.c 2015-10-18 11:13:23.000000000 +0200
1521 @@ -1,5 +1,7 @@
1522 +/* $NetBSD: info.c,v 1.12 2010/02/18 14:00:39 wiz Exp $ */
1523 +
1524 /* info.c -- Display nodes of Info files in multiple windows.
1525 - $Id: info.c,v 1.11 2004/04/11 17:56:45 karl Exp $
1526 + Id: info.c,v 1.11 2004/04/11 17:56:45 karl Exp
1528 Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
1529 2004 Free Software Foundation, Inc.
1530 @@ -356,7 +358,7 @@
1531 }
1533 /* Get the initial Info node. It is either "(dir)Top", or what the user
1534 - specifed with values in user_filename and user_nodenames. */
1535 + specified with values in user_filename and user_nodenames. */
1536 initial_node = info_get_node (user_filename,
1537 user_nodenames ? user_nodenames[0] : 0);
1539 diff -rNU3 texinfo.orig/info/info.h texinfo/info/info.h
1540 --- texinfo.orig/info/info.h 2004-04-11 19:56:45.000000000 +0200
1541 +++ texinfo/info/info.h 2015-10-18 11:13:23.000000000 +0200
1542 @@ -1,5 +1,7 @@
1543 +/* $NetBSD: info.h,v 1.1.1.6 2008/09/02 07:49:43 christos Exp $ */
1544 +
1545 /* info.h -- Header file which includes all of the other headers.
1546 - $Id: info.h,v 1.4 2004/04/11 17:56:45 karl Exp $
1547 + Id: info.h,v 1.4 2004/04/11 17:56:45 karl Exp
1549 Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004 Free Software
1550 Foundation, Inc.
1551 diff -rNU3 texinfo.orig/info/infodoc.c texinfo/info/infodoc.c
1552 --- texinfo.orig/info/infodoc.c 2004-04-11 19:56:45.000000000 +0200
1553 +++ texinfo/info/infodoc.c 2015-10-18 11:13:23.000000000 +0200
1554 @@ -1,5 +1,7 @@
1555 +/* $NetBSD: infodoc.c,v 1.1.1.6 2008/09/02 07:49:44 christos Exp $ */
1556 +
1557 /* infodoc.c -- functions which build documentation nodes.
1558 - $Id: infodoc.c,v 1.8 2004/04/11 17:56:45 karl Exp $
1559 + Id: infodoc.c,v 1.8 2004/04/11 17:56:45 karl Exp
1561 Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004 Free Software
1562 Foundation, Inc.
1563 diff -rNU3 texinfo.orig/info/infokey.c texinfo/info/infokey.c
1564 --- texinfo.orig/info/infokey.c 2004-12-14 01:15:36.000000000 +0100
1565 +++ texinfo/info/infokey.c 2015-10-18 11:13:23.000000000 +0200
1566 @@ -1,5 +1,7 @@
1567 +/* $NetBSD: infokey.c,v 1.4 2008/09/02 08:41:51 christos Exp $ */
1568 +
1569 /* infokey.c -- compile ~/.infokey to ~/.info.
1570 - $Id: infokey.c,v 1.9 2004/12/14 00:15:36 karl Exp $
1571 + Id: infokey.c,v 1.9 2004/12/14 00:15:36 karl Exp
1573 Copyright (C) 1999, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
1575 @@ -639,7 +641,7 @@
1576 {
1577 syntax_error (filename, lnum,
1578 (char *) _("NUL character (^%c) not permitted"),
1579 - (void *) (long) c, NULL, NULL, NULL);
1580 + (void *)((intptr_t)c), NULL, NULL, NULL);
1581 error = 1;
1582 }
1583 seqstate = normal;
1584 @@ -663,7 +665,7 @@
1585 if (alen == 0)
1586 {
1587 syntax_error (filename, lnum, (char *) _("missing action name"),
1588 - (void *) (long) c, NULL, NULL, NULL);
1589 + (void *)((intptr_t)c), NULL, NULL, NULL);
1590 error = 1;
1591 }
1592 else
1593 diff -rNU3 texinfo.orig/info/infokey.h texinfo/info/infokey.h
1594 --- texinfo.orig/info/infokey.h 2004-04-11 19:56:45.000000000 +0200
1595 +++ texinfo/info/infokey.h 2015-10-18 11:13:23.000000000 +0200
1596 @@ -1,5 +1,7 @@
1597 +/* $NetBSD: infokey.h,v 1.1.1.3 2008/09/02 07:50:15 christos Exp $ */
1598 +
1599 /* infokey.h -- Custom keystroke definition support.
1600 - $Id: infokey.h,v 1.2 2004/04/11 17:56:45 karl Exp $
1601 + Id: infokey.h,v 1.2 2004/04/11 17:56:45 karl Exp
1603 Copyright (C) 1999, 2002 Free Software Foundation, Inc.
1605 diff -rNU3 texinfo.orig/info/infomap.c texinfo/info/infomap.c
1606 --- texinfo.orig/info/infomap.c 2004-07-30 22:43:40.000000000 +0200
1607 +++ texinfo/info/infomap.c 2015-10-18 11:13:23.000000000 +0200
1608 @@ -1,5 +1,7 @@
1609 +/* $NetBSD: infomap.c,v 1.1.1.7 2008/09/02 07:49:47 christos Exp $ */
1610 +
1611 /* infomap.c -- keymaps for Info.
1612 - $Id: infomap.c,v 1.10 2004/07/30 20:43:40 karl Exp $
1613 + Id: infomap.c,v 1.10 2004/07/30 20:43:40 karl Exp
1615 Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004 Free Software
1616 Foundation, Inc.
1617 diff -rNU3 texinfo.orig/info/infomap.h texinfo/info/infomap.h
1618 --- texinfo.orig/info/infomap.h 2004-04-11 19:56:46.000000000 +0200
1619 +++ texinfo/info/infomap.h 2015-10-18 11:13:23.000000000 +0200
1620 @@ -1,5 +1,7 @@
1621 +/* $NetBSD: infomap.h,v 1.1.1.4 2008/09/02 07:49:47 christos Exp $ */
1622 +
1623 /* infomap.h -- description of a keymap in Info and related functions.
1624 - $Id: infomap.h,v 1.3 2004/04/11 17:56:46 karl Exp $
1625 + Id: infomap.h,v 1.3 2004/04/11 17:56:46 karl Exp
1627 Copyright (C) 1993, 2001, 2004 Free Software Foundation, Inc.
1629 diff -rNU3 texinfo.orig/info/key.h texinfo/info/key.h
1630 --- texinfo.orig/info/key.h 2002-08-26 01:38:38.000000000 +0200
1631 +++ texinfo/info/key.h 2015-10-18 11:13:23.000000000 +0200
1632 @@ -1,3 +1,5 @@
1633 +/* $NetBSD: key.h,v 1.1.1.1 2003/01/17 14:54:34 wiz Exp $ */
1634 +
1635 /* key.h -- Structure associating function names with numeric codes. */
1637 /* This file is part of GNU Info, a program for reading online documentation
1638 diff -rNU3 texinfo.orig/info/m-x.c texinfo/info/m-x.c
1639 --- texinfo.orig/info/m-x.c 2004-04-11 19:56:46.000000000 +0200
1640 +++ texinfo/info/m-x.c 2015-10-18 11:13:23.000000000 +0200
1641 @@ -1,5 +1,7 @@
1642 +/* $NetBSD: m-x.c,v 1.1.1.5 2008/09/02 07:49:47 christos Exp $ */
1643 +
1644 /* m-x.c -- Meta-x minibuffer reader.
1645 - $Id: m-x.c,v 1.3 2004/04/11 17:56:46 karl Exp $
1646 + Id: m-x.c,v 1.3 2004/04/11 17:56:46 karl Exp
1648 Copyright (C) 1993, 1997, 1998, 2001, 2002, 2004 Free Software
1649 Foundation, Inc.
1650 diff -rNU3 texinfo.orig/info/makedoc.c texinfo/info/makedoc.c
1651 --- texinfo.orig/info/makedoc.c 2004-04-11 19:56:46.000000000 +0200
1652 +++ texinfo/info/makedoc.c 2015-10-18 11:13:23.000000000 +0200
1653 @@ -1,5 +1,7 @@
1654 +/* $NetBSD: makedoc.c,v 1.1.1.6 2008/09/02 07:50:15 christos Exp $ */
1655 +
1656 /* makedoc.c -- make doc.c and funs.h from input files.
1657 - $Id: makedoc.c,v 1.4 2004/04/11 17:56:46 karl Exp $
1658 + Id: makedoc.c,v 1.4 2004/04/11 17:56:46 karl Exp
1660 Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004 Free Software
1661 Foundation, Inc.
1662 diff -rNU3 texinfo.orig/info/man.c texinfo/info/man.c
1663 --- texinfo.orig/info/man.c 2004-04-11 19:56:46.000000000 +0200
1664 +++ texinfo/info/man.c 2015-10-18 11:13:23.000000000 +0200
1665 @@ -1,5 +1,7 @@
1666 +/* $NetBSD: man.c,v 1.1.1.6 2008/09/02 07:49:49 christos Exp $ */
1667 +
1668 /* man.c: How to read and format man files.
1669 - $Id: man.c,v 1.4 2004/04/11 17:56:46 karl Exp $
1670 + Id: man.c,v 1.4 2004/04/11 17:56:46 karl Exp
1672 Copyright (C) 1995, 1997, 1998, 1999, 2000, 2002, 2003, 2004 Free Software
1673 Foundation, Inc.
1674 diff -rNU3 texinfo.orig/info/man.h texinfo/info/man.h
1675 --- texinfo.orig/info/man.h 2004-04-11 19:56:46.000000000 +0200
1676 +++ texinfo/info/man.h 2015-10-18 11:13:23.000000000 +0200
1677 @@ -1,5 +1,7 @@
1678 +/* $NetBSD: man.h,v 1.1.1.4 2008/09/02 07:49:49 christos Exp $ */
1679 +
1680 /* man.h: Defines and external function declarations for man.c.
1681 - $Id: man.h,v 1.3 2004/04/11 17:56:46 karl Exp $
1682 + Id: man.h,v 1.3 2004/04/11 17:56:46 karl Exp
1684 This file is part of GNU Info, a program for reading online documentation
1685 stored in Info format.
1686 diff -rNU3 texinfo.orig/info/nodemenu.c texinfo/info/nodemenu.c
1687 --- texinfo.orig/info/nodemenu.c 2004-04-11 19:56:46.000000000 +0200
1688 +++ texinfo/info/nodemenu.c 2015-10-18 11:13:23.000000000 +0200
1689 @@ -1,5 +1,7 @@
1690 +/* $NetBSD: nodemenu.c,v 1.1.1.6 2008/09/02 07:49:49 christos Exp $ */
1691 +
1692 /* nodemenu.c -- produce a menu of all visited nodes.
1693 - $Id: nodemenu.c,v 1.5 2004/04/11 17:56:46 karl Exp $
1694 + Id: nodemenu.c,v 1.5 2004/04/11 17:56:46 karl Exp
1696 Copyright (C) 1993, 1997, 1998, 2002, 2003, 2004 Free Software
1697 Foundation, Inc.
1698 diff -rNU3 texinfo.orig/info/nodes.c texinfo/info/nodes.c
1699 --- texinfo.orig/info/nodes.c 2004-04-11 19:56:46.000000000 +0200
1700 +++ texinfo/info/nodes.c 2015-10-18 11:13:23.000000000 +0200
1701 @@ -1,5 +1,7 @@
1702 +/* $NetBSD: nodes.c,v 1.7 2008/09/02 08:00:24 christos Exp $ */
1703 +
1704 /* nodes.c -- how to get an Info file and node.
1705 - $Id: nodes.c,v 1.4 2004/04/11 17:56:46 karl Exp $
1706 + Id: nodes.c,v 1.4 2004/04/11 17:56:46 karl Exp
1708 Copyright (C) 1993, 1998, 1999, 2000, 2002, 2003, 2004 Free Software
1709 Foundation, Inc.
1710 diff -rNU3 texinfo.orig/info/nodes.h texinfo/info/nodes.h
1711 --- texinfo.orig/info/nodes.h 2004-04-11 19:56:46.000000000 +0200
1712 +++ texinfo/info/nodes.h 2015-10-18 11:13:23.000000000 +0200
1713 @@ -1,5 +1,7 @@
1714 +/* $NetBSD: nodes.h,v 1.1.1.5 2008/09/02 07:49:51 christos Exp $ */
1715 +
1716 /* nodes.h -- How we represent nodes internally.
1717 - $Id: nodes.h,v 1.3 2004/04/11 17:56:46 karl Exp $
1718 + Id: nodes.h,v 1.3 2004/04/11 17:56:46 karl Exp
1720 Copyright (C) 1993, 1997, 1998, 2002, 2004 Free Software Foundation, Inc.
1722 diff -rNU3 texinfo.orig/info/pcterm.c texinfo/info/pcterm.c
1723 --- texinfo.orig/info/pcterm.c 2004-04-11 19:56:46.000000000 +0200
1724 +++ texinfo/info/pcterm.c 2015-10-18 11:13:23.000000000 +0200
1725 @@ -1,5 +1,7 @@
1726 +/* $NetBSD: pcterm.c,v 1.1.1.5 2008/09/02 07:50:19 christos Exp $ */
1727 +
1728 /* pcterm.c -- How to handle the PC terminal for Info under MS-DOS/MS-Windows.
1729 - $Id: pcterm.c,v 1.4 2004/04/11 17:56:46 karl Exp $
1730 + Id: pcterm.c,v 1.4 2004/04/11 17:56:46 karl Exp
1732 Copyright (C) 1998, 1999, 2003, 2004 Free Software Foundation, Inc.
1734 diff -rNU3 texinfo.orig/info/search.c texinfo/info/search.c
1735 --- texinfo.orig/info/search.c 2004-04-11 19:56:46.000000000 +0200
1736 +++ texinfo/info/search.c 2015-10-18 11:13:23.000000000 +0200
1737 @@ -1,5 +1,7 @@
1738 +/* $NetBSD: search.c,v 1.1.1.5 2008/09/02 07:49:51 christos Exp $ */
1739 +
1740 /* search.c -- searching large bodies of text.
1741 - $Id: search.c,v 1.3 2004/04/11 17:56:46 karl Exp $
1742 + Id: search.c,v 1.3 2004/04/11 17:56:46 karl Exp
1744 Copyright (C) 1993, 1997, 1998, 2002, 2004 Free Software Foundation, Inc.
1746 diff -rNU3 texinfo.orig/info/search.h texinfo/info/search.h
1747 --- texinfo.orig/info/search.h 2004-04-11 19:56:46.000000000 +0200
1748 +++ texinfo/info/search.h 2015-10-18 11:13:23.000000000 +0200
1749 @@ -1,5 +1,7 @@
1750 +/* $NetBSD: search.h,v 1.1.1.5 2008/09/02 07:49:53 christos Exp $ */
1751 +
1752 /* search.h -- Structure used to search large bodies of text, with bounds.
1753 - $Id: search.h,v 1.3 2004/04/11 17:56:46 karl Exp $
1754 + Id: search.h,v 1.3 2004/04/11 17:56:46 karl Exp
1756 Copyright (C) 1993, 1997, 1998, 2002, 2004 Free Software Foundation, Inc.
1758 diff -rNU3 texinfo.orig/info/session.c texinfo/info/session.c
1759 --- texinfo.orig/info/session.c 2004-12-14 01:15:36.000000000 +0100
1760 +++ texinfo/info/session.c 2015-10-18 11:13:23.000000000 +0200
1761 @@ -1,5 +1,7 @@
1762 +/* $NetBSD: session.c,v 1.6 2014/02/27 18:09:18 joerg Exp $ */
1763 +
1764 /* session.c -- user windowing interface to Info.
1765 - $Id: session.c,v 1.16 2004/12/14 00:15:36 karl Exp $
1766 + Id: session.c,v 1.16 2004/12/14 00:15:36 karl Exp
1768 Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
1769 Free Software Foundation, Inc.
1770 @@ -962,7 +964,7 @@
1771 same as the first menu item found in this node. */
1772 window_message_in_echo_area
1773 ((char *) _("Moving Up %d time(s), then Next."),
1774 - (void *) (long) up_counter, NULL);
1775 + (void *)((intptr_t)up_counter), NULL);
1777 info_handle_pointer ("Next", window);
1778 return;
1779 @@ -1959,7 +1961,7 @@
1781 /* Special case. Item "0" is the last item in this menu. */
1782 if (item == 0)
1783 - for (i = 0; menu[i + 1]; i++);
1784 + for (i = 0; menu[i] && menu[i + 1]; i++);
1785 else
1786 {
1787 for (i = 0; menu[i]; i++)
1788 @@ -1975,7 +1977,7 @@
1789 }
1790 else
1791 info_error ((char *) _("There aren't %d items in this menu."),
1792 - (void *) (long) item, NULL);
1793 + (void *)((intptr_t)item), NULL);
1795 info_free_references (menu);
1796 return;
1797 @@ -2018,7 +2020,7 @@
1798 /* See how far POS is from this xref. Take into account the
1799 `*Note' that begins the xref, since as far as the user is
1800 concerned, that's where it starts. */
1801 - delta = MIN (labs (pos - (xref->start - strlen (INFO_XREF_LABEL))),
1802 + delta = MIN (labs (pos - (xref->start - (long)strlen (INFO_XREF_LABEL))),
1803 labs (pos - xref->end));
1805 /* It's the <= instead of < that makes us choose the forward xref
1806 @@ -2245,7 +2247,7 @@
1807 {
1808 /* ref->end is more accurate estimate of position
1809 for menus than ref->start. Go figure. */
1810 - int dist = abs (window->point - ref->end);
1811 + int dist = labs (window->point - ref->end);
1813 if (dist < min_dist)
1814 {
1815 diff -rNU3 texinfo.orig/info/session.h texinfo/info/session.h
1816 --- texinfo.orig/info/session.h 2004-04-11 19:56:46.000000000 +0200
1817 +++ texinfo/info/session.h 2015-10-18 11:13:23.000000000 +0200
1818 @@ -1,5 +1,7 @@
1819 +/* $NetBSD: session.h,v 1.1.1.5 2008/09/02 07:50:07 christos Exp $ */
1820 +
1821 /* session.h -- Functions found in session.c.
1822 - $Id: session.h,v 1.3 2004/04/11 17:56:46 karl Exp $
1823 + Id: session.h,v 1.3 2004/04/11 17:56:46 karl Exp
1825 Copyright (C) 1993, 1998, 1999, 2001, 2002, 2004 Free Software
1826 Foundation, Inc.
1827 diff -rNU3 texinfo.orig/info/signals.c texinfo/info/signals.c
1828 --- texinfo.orig/info/signals.c 2004-04-11 19:56:46.000000000 +0200
1829 +++ texinfo/info/signals.c 2015-10-18 11:13:23.000000000 +0200
1830 @@ -1,5 +1,7 @@
1831 +/* $NetBSD: signals.c,v 1.1.1.6 2008/09/02 07:50:08 christos Exp $ */
1832 +
1833 /* signals.c -- install and maintain signal handlers.
1834 - $Id: signals.c,v 1.7 2004/04/11 17:56:46 karl Exp $
1835 + Id: signals.c,v 1.7 2004/04/11 17:56:46 karl Exp
1837 Copyright (C) 1993, 1994, 1995, 1998, 2002, 2003, 2004 Free Software
1838 Foundation, Inc.
1839 diff -rNU3 texinfo.orig/info/signals.h texinfo/info/signals.h
1840 --- texinfo.orig/info/signals.h 2004-04-11 19:56:46.000000000 +0200
1841 +++ texinfo/info/signals.h 2015-10-18 11:13:23.000000000 +0200
1842 @@ -1,5 +1,7 @@
1843 +/* $NetBSD: signals.h,v 1.1.1.4 2008/09/02 07:50:08 christos Exp $ */
1844 +
1845 /* signals.h -- header to include system dependent signal definitions.
1846 - $Id: signals.h,v 1.2 2004/04/11 17:56:46 karl Exp $
1847 + Id: signals.h,v 1.2 2004/04/11 17:56:46 karl Exp
1849 Copyright (C) 1993, 1994, 1995, 1997, 2002, 2004 Free Software Foundation, Inc.
1851 diff -rNU3 texinfo.orig/info/termdep.h texinfo/info/termdep.h
1852 --- texinfo.orig/info/termdep.h 2004-04-11 19:56:46.000000000 +0200
1853 +++ texinfo/info/termdep.h 2015-10-18 11:13:23.000000000 +0200
1854 @@ -1,5 +1,7 @@
1855 +/* $NetBSD: termdep.h,v 1.1.1.5 2008/09/02 07:50:08 christos Exp $ */
1856 +
1857 /* termdep.h -- system things that terminal.c depends on.
1858 - $Id: termdep.h,v 1.2 2004/04/11 17:56:46 karl Exp $
1859 + Id: termdep.h,v 1.2 2004/04/11 17:56:46 karl Exp
1861 Copyright (C) 1993, 1996, 1997, 1998, 2001, 2002 Free Software
1862 Foundation, Inc.
1863 diff -rNU3 texinfo.orig/info/terminal.c texinfo/info/terminal.c
1864 --- texinfo.orig/info/terminal.c 2004-04-11 19:56:46.000000000 +0200
1865 +++ texinfo/info/terminal.c 2015-10-18 11:13:23.000000000 +0200
1866 @@ -1,5 +1,7 @@
1867 +/* $NetBSD: terminal.c,v 1.11 2011/05/15 14:35:47 christos Exp $ */
1868 +
1869 /* terminal.c -- how to handle the physical terminal for Info.
1870 - $Id: terminal.c,v 1.3 2004/04/11 17:56:46 karl Exp $
1871 + Id: terminal.c,v 1.3 2004/04/11 17:56:46 karl Exp
1873 Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1996, 1997, 1998,
1874 1999, 2001, 2002, 2004 Free Software Foundation, Inc.
1875 @@ -25,6 +27,7 @@
1876 #include "termdep.h"
1878 #include <sys/types.h>
1879 +#include <sys/ioctl.h>
1880 #include <signal.h>
1882 /* The Unix termcap interface code. */
1883 diff -rNU3 texinfo.orig/info/terminal.h texinfo/info/terminal.h
1884 --- texinfo.orig/info/terminal.h 2004-04-11 19:56:46.000000000 +0200
1885 +++ texinfo/info/terminal.h 2015-10-18 11:13:23.000000000 +0200
1886 @@ -1,5 +1,7 @@
1887 +/* $NetBSD: terminal.h,v 1.1.1.4 2008/09/02 07:50:09 christos Exp $ */
1888 +
1889 /* terminal.h -- The external interface to terminal I/O.
1890 - $Id: terminal.h,v 1.3 2004/04/11 17:56:46 karl Exp $
1891 + Id: terminal.h,v 1.3 2004/04/11 17:56:46 karl Exp
1893 Copyright (C) 1993, 1996, 1997, 2001, 2002, 2004 Free Software
1894 Foundation, Inc.
1895 diff -rNU3 texinfo.orig/info/tilde.c texinfo/info/tilde.c
1896 --- texinfo.orig/info/tilde.c 2004-04-11 19:56:46.000000000 +0200
1897 +++ texinfo/info/tilde.c 2015-10-18 11:13:23.000000000 +0200
1898 @@ -1,5 +1,7 @@
1899 +/* $NetBSD: tilde.c,v 1.1.1.5 2008/09/02 07:50:09 christos Exp $ */
1900 +
1901 /* tilde.c -- tilde expansion code (~/foo := $HOME/foo).
1902 - $Id: tilde.c,v 1.3 2004/04/11 17:56:46 karl Exp $
1903 + Id: tilde.c,v 1.3 2004/04/11 17:56:46 karl Exp
1905 Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1996, 1998, 1999,
1906 2002, 2004 Free Software Foundation, Inc.
1907 diff -rNU3 texinfo.orig/info/tilde.h texinfo/info/tilde.h
1908 --- texinfo.orig/info/tilde.h 2004-04-11 19:56:46.000000000 +0200
1909 +++ texinfo/info/tilde.h 2015-10-18 11:13:23.000000000 +0200
1910 @@ -1,5 +1,7 @@
1911 +/* $NetBSD: tilde.h,v 1.1.1.4 2008/09/02 07:50:10 christos Exp $ */
1912 +
1913 /* tilde.h: Externally available variables and function in libtilde.a.
1914 - $Id: tilde.h,v 1.3 2004/04/11 17:56:46 karl Exp $
1915 + Id: tilde.h,v 1.3 2004/04/11 17:56:46 karl Exp
1917 This file has appeared in prior works by the Free Software Foundation;
1918 thus it carries copyright dates from 1988 through 1993.
1919 diff -rNU3 texinfo.orig/info/variables.c texinfo/info/variables.c
1920 --- texinfo.orig/info/variables.c 2004-04-11 19:56:46.000000000 +0200
1921 +++ texinfo/info/variables.c 2015-10-18 11:13:23.000000000 +0200
1922 @@ -1,5 +1,7 @@
1923 +/* $NetBSD: variables.c,v 1.1.1.5 2008/09/02 07:50:10 christos Exp $ */
1924 +
1925 /* variables.c -- how to manipulate user visible variables in Info.
1926 - $Id: variables.c,v 1.3 2004/04/11 17:56:46 karl Exp $
1927 + Id: variables.c,v 1.3 2004/04/11 17:56:46 karl Exp
1929 Copyright (C) 1993, 1997, 2001, 2002, 2004 Free Software Foundation, Inc.
1931 diff -rNU3 texinfo.orig/info/variables.h texinfo/info/variables.h
1932 --- texinfo.orig/info/variables.h 2004-04-11 19:56:46.000000000 +0200
1933 +++ texinfo/info/variables.h 2015-10-18 11:13:23.000000000 +0200
1934 @@ -1,5 +1,7 @@
1935 +/* $NetBSD: variables.h,v 1.1.1.4 2008/09/02 07:50:10 christos Exp $ */
1936 +
1937 /* variables.h -- Description of user visible variables in Info.
1938 - $Id: variables.h,v 1.3 2004/04/11 17:56:46 karl Exp $
1939 + Id: variables.h,v 1.3 2004/04/11 17:56:46 karl Exp
1941 This file is part of GNU Info, a program for reading online documentation
1942 stored in Info format.
1943 diff -rNU3 texinfo.orig/info/window.c texinfo/info/window.c
1944 --- texinfo.orig/info/window.c 2004-04-11 19:56:46.000000000 +0200
1945 +++ texinfo/info/window.c 2015-10-18 11:13:23.000000000 +0200
1946 @@ -1,5 +1,7 @@
1947 +/* $NetBSD: window.c,v 1.1.1.6 2008/09/02 07:50:14 christos Exp $ */
1948 +
1949 /* window.c -- windows in Info.
1950 - $Id: window.c,v 1.4 2004/04/11 17:56:46 karl Exp $
1951 + Id: window.c,v 1.4 2004/04/11 17:56:46 karl Exp
1953 Copyright (C) 1993, 1997, 1998, 2001, 2002, 2003, 2004 Free Software
1954 Foundation, Inc.
1955 diff -rNU3 texinfo.orig/info/window.h texinfo/info/window.h
1956 --- texinfo.orig/info/window.h 2004-04-11 19:56:46.000000000 +0200
1957 +++ texinfo/info/window.h 2015-10-18 11:13:23.000000000 +0200
1958 @@ -1,5 +1,7 @@
1959 +/* $NetBSD: window.h,v 1.1.1.4 2008/09/02 07:50:14 christos Exp $ */
1960 +
1961 /* window.h -- Structure and flags used in manipulating Info windows.
1962 - $Id: window.h,v 1.3 2004/04/11 17:56:46 karl Exp $
1963 + Id: window.h,v 1.3 2004/04/11 17:56:46 karl Exp
1965 This file is part of GNU Info, a program for reading online documentation
1966 stored in Info format.
1967 diff -rNU3 texinfo.orig/intl/Makefile.in texinfo/intl/Makefile.in
1968 --- texinfo.orig/intl/Makefile.in 2004-04-11 19:56:46.000000000 +0200
1969 +++ texinfo/intl/Makefile.in 2015-10-18 11:13:23.000000000 +0200
1970 @@ -19,7 +19,7 @@
1971 PACKAGE = @PACKAGE@
1972 VERSION = @VERSION@
1974 -SHELL = /bin/sh
1975 +SHELL = @SHELL@
1977 srcdir = @srcdir@
1978 top_srcdir = @top_srcdir@
1979 diff -rNU3 texinfo.orig/intl/bindtextdom.c texinfo/intl/bindtextdom.c
1980 --- texinfo.orig/intl/bindtextdom.c 2003-12-24 16:12:48.000000000 +0100
1981 +++ texinfo/intl/bindtextdom.c 2015-10-18 11:13:23.000000000 +0200
1982 @@ -1,3 +1,5 @@
1983 +/* $NetBSD: bindtextdom.c,v 1.1.1.5 2004/07/12 23:27:17 wiz Exp $ */
1984 +
1985 /* Implementation of the bindtextdomain(3) function
1986 Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
1988 diff -rNU3 texinfo.orig/intl/dcgettext.c texinfo/intl/dcgettext.c
1989 --- texinfo.orig/intl/dcgettext.c 2003-12-24 16:12:48.000000000 +0100
1990 +++ texinfo/intl/dcgettext.c 2015-10-18 11:13:23.000000000 +0200
1991 @@ -1,3 +1,5 @@
1992 +/* $NetBSD: dcgettext.c,v 1.1.1.4 2004/07/12 23:27:16 wiz Exp $ */
1993 +
1994 /* Implementation of the dcgettext(3) function.
1995 Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
1997 diff -rNU3 texinfo.orig/intl/dcigettext.c texinfo/intl/dcigettext.c
1998 --- texinfo.orig/intl/dcigettext.c 2003-12-24 16:12:48.000000000 +0100
1999 +++ texinfo/intl/dcigettext.c 2015-10-18 11:13:23.000000000 +0200
2000 @@ -1,3 +1,5 @@
2001 +/* $NetBSD: dcigettext.c,v 1.1.1.3 2004/07/12 23:27:16 wiz Exp $ */
2002 +
2003 /* Implementation of the internal dcigettext function.
2004 Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
2006 diff -rNU3 texinfo.orig/intl/dcngettext.c texinfo/intl/dcngettext.c
2007 --- texinfo.orig/intl/dcngettext.c 2003-12-24 16:12:48.000000000 +0100
2008 +++ texinfo/intl/dcngettext.c 2015-10-18 11:13:23.000000000 +0200
2009 @@ -1,3 +1,5 @@
2010 +/* $NetBSD: dcngettext.c,v 1.1.1.3 2004/07/12 23:27:16 wiz Exp $ */
2011 +
2012 /* Implementation of the dcngettext(3) function.
2013 Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
2015 diff -rNU3 texinfo.orig/intl/dgettext.c texinfo/intl/dgettext.c
2016 --- texinfo.orig/intl/dgettext.c 2003-12-24 16:12:48.000000000 +0100
2017 +++ texinfo/intl/dgettext.c 2015-10-18 11:13:23.000000000 +0200
2018 @@ -1,3 +1,5 @@
2019 +/* $NetBSD: dgettext.c,v 1.1.1.4 2004/07/12 23:27:16 wiz Exp $ */
2020 +
2021 /* Implementation of the dgettext(3) function.
2022 Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
2024 diff -rNU3 texinfo.orig/intl/dngettext.c texinfo/intl/dngettext.c
2025 --- texinfo.orig/intl/dngettext.c 2003-12-24 16:12:48.000000000 +0100
2026 +++ texinfo/intl/dngettext.c 2015-10-18 11:13:23.000000000 +0200
2027 @@ -1,3 +1,5 @@
2028 +/* $NetBSD: dngettext.c,v 1.1.1.3 2004/07/12 23:27:16 wiz Exp $ */
2029 +
2030 /* Implementation of the dngettext(3) function.
2031 Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
2033 diff -rNU3 texinfo.orig/intl/eval-plural.h texinfo/intl/eval-plural.h
2034 --- texinfo.orig/intl/eval-plural.h 2003-12-24 16:12:48.000000000 +0100
2035 +++ texinfo/intl/eval-plural.h 2015-10-18 11:13:23.000000000 +0200
2036 @@ -1,3 +1,5 @@
2037 +/* $NetBSD: eval-plural.h,v 1.1.1.2 2004/07/12 23:27:17 wiz Exp $ */
2038 +
2039 /* Plural expression evaluation.
2040 Copyright (C) 2000-2003 Free Software Foundation, Inc.
2042 diff -rNU3 texinfo.orig/intl/explodename.c texinfo/intl/explodename.c
2043 --- texinfo.orig/intl/explodename.c 2003-12-24 16:12:48.000000000 +0100
2044 +++ texinfo/intl/explodename.c 2015-10-18 11:13:23.000000000 +0200
2045 @@ -1,3 +1,5 @@
2046 +/* $NetBSD: explodename.c,v 1.1.1.4 2004/07/12 23:27:16 wiz Exp $ */
2047 +
2048 /* Copyright (C) 1995-1998, 2000-2001, 2003 Free Software Foundation, Inc.
2049 Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
2051 diff -rNU3 texinfo.orig/intl/finddomain.c texinfo/intl/finddomain.c
2052 --- texinfo.orig/intl/finddomain.c 2003-12-24 16:12:48.000000000 +0100
2053 +++ texinfo/intl/finddomain.c 2015-10-18 11:13:23.000000000 +0200
2054 @@ -1,3 +1,5 @@
2055 +/* $NetBSD: finddomain.c,v 1.1.1.5 2004/07/12 23:27:16 wiz Exp $ */
2056 +
2057 /* Handle list of needed message catalogs
2058 Copyright (C) 1995-1999, 2000-2001, 2003 Free Software Foundation, Inc.
2059 Written by Ulrich Drepper <drepper@gnu.org>, 1995.
2060 diff -rNU3 texinfo.orig/intl/gettext.c texinfo/intl/gettext.c
2061 --- texinfo.orig/intl/gettext.c 2003-12-24 16:12:48.000000000 +0100
2062 +++ texinfo/intl/gettext.c 2015-10-18 11:13:23.000000000 +0200
2063 @@ -1,3 +1,5 @@
2064 +/* $NetBSD: gettext.c,v 1.1.1.4 2004/07/12 23:27:16 wiz Exp $ */
2065 +
2066 /* Implementation of gettext(3) function.
2067 Copyright (C) 1995, 1997, 2000-2003 Free Software Foundation, Inc.
2069 diff -rNU3 texinfo.orig/intl/gettextP.h texinfo/intl/gettextP.h
2070 --- texinfo.orig/intl/gettextP.h 2003-12-24 16:12:48.000000000 +0100
2071 +++ texinfo/intl/gettextP.h 2015-10-18 11:13:23.000000000 +0200
2072 @@ -1,3 +1,5 @@
2073 +/* $NetBSD: gettextP.h,v 1.1.1.5 2004/07/12 23:27:17 wiz Exp $ */
2074 +
2075 /* Header describing internals of libintl library.
2076 Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
2077 Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
2078 diff -rNU3 texinfo.orig/intl/gmo.h texinfo/intl/gmo.h
2079 --- texinfo.orig/intl/gmo.h 2004-04-11 19:56:46.000000000 +0200
2080 +++ texinfo/intl/gmo.h 2015-10-18 11:13:23.000000000 +0200
2081 @@ -1,3 +1,5 @@
2082 +/* $NetBSD: gmo.h,v 1.1.1.2 2004/07/12 23:27:17 wiz Exp $ */
2083 +
2084 /* Description of GNU message catalog format: general file layout.
2085 Copyright (C) 1995, 1997, 2000-2002, 2004 Free Software Foundation, Inc.
2087 diff -rNU3 texinfo.orig/intl/hash-string.h texinfo/intl/hash-string.h
2088 --- texinfo.orig/intl/hash-string.h 2003-12-24 16:12:48.000000000 +0100
2089 +++ texinfo/intl/hash-string.h 2015-10-18 11:13:23.000000000 +0200
2090 @@ -1,3 +1,5 @@
2091 +/* $NetBSD: hash-string.h,v 1.1.1.4 2004/07/12 23:27:17 wiz Exp $ */
2092 +
2093 /* Description of GNU message catalog format: string hashing function.
2094 Copyright (C) 1995, 1997-1998, 2000-2003 Free Software Foundation, Inc.
2096 diff -rNU3 texinfo.orig/intl/intl-compat.c texinfo/intl/intl-compat.c
2097 --- texinfo.orig/intl/intl-compat.c 2003-12-24 16:12:48.000000000 +0100
2098 +++ texinfo/intl/intl-compat.c 2015-10-18 11:13:23.000000000 +0200
2099 @@ -1,3 +1,5 @@
2100 +/* $NetBSD: intl-compat.c,v 1.1.1.4 2004/07/12 23:27:15 wiz Exp $ */
2101 +
2102 /* intl-compat.c - Stub functions to call gettext functions from GNU gettext
2103 Library.
2104 Copyright (C) 1995, 2000-2003 Software Foundation, Inc.
2105 diff -rNU3 texinfo.orig/intl/l10nflist.c texinfo/intl/l10nflist.c
2106 --- texinfo.orig/intl/l10nflist.c 2003-12-24 16:12:48.000000000 +0100
2107 +++ texinfo/intl/l10nflist.c 2015-10-18 11:13:23.000000000 +0200
2108 @@ -1,3 +1,5 @@
2109 +/* $NetBSD: l10nflist.c,v 1.1.1.4 2004/07/12 23:27:16 wiz Exp $ */
2110 +
2111 /* Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
2112 Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
2114 diff -rNU3 texinfo.orig/intl/loadinfo.h texinfo/intl/loadinfo.h
2115 --- texinfo.orig/intl/loadinfo.h 2003-12-24 16:12:48.000000000 +0100
2116 +++ texinfo/intl/loadinfo.h 2015-10-18 11:13:23.000000000 +0200
2117 @@ -1,3 +1,5 @@
2118 +/* $NetBSD: loadinfo.h,v 1.1.1.4 2004/07/12 23:27:17 wiz Exp $ */
2119 +
2120 /* Copyright (C) 1996-1999, 2000-2003 Free Software Foundation, Inc.
2121 This file is part of the GNU C Library.
2122 Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
2123 diff -rNU3 texinfo.orig/intl/loadmsgcat.c texinfo/intl/loadmsgcat.c
2124 --- texinfo.orig/intl/loadmsgcat.c 2004-04-11 19:56:46.000000000 +0200
2125 +++ texinfo/intl/loadmsgcat.c 2015-10-18 11:13:23.000000000 +0200
2126 @@ -1,3 +1,5 @@
2127 +/* $NetBSD: loadmsgcat.c,v 1.1.1.5 2004/07/12 23:27:16 wiz Exp $ */
2128 +
2129 /* Load needed message catalogs.
2130 Copyright (C) 1995-1999, 2000-2004 Free Software Foundation, Inc.
2132 diff -rNU3 texinfo.orig/intl/localcharset.c texinfo/intl/localcharset.c
2133 --- texinfo.orig/intl/localcharset.c 2003-12-24 16:12:48.000000000 +0100
2134 +++ texinfo/intl/localcharset.c 2015-10-18 11:13:23.000000000 +0200
2135 @@ -1,3 +1,5 @@
2136 +/* $NetBSD: localcharset.c,v 1.1.1.3 2004/07/12 23:27:16 wiz Exp $ */
2137 +
2138 /* Determine a canonical name for the current locale's character encoding.
2140 Copyright (C) 2000-2003 Free Software Foundation, Inc.
2141 diff -rNU3 texinfo.orig/intl/localcharset.h texinfo/intl/localcharset.h
2142 --- texinfo.orig/intl/localcharset.h 2003-11-06 15:36:16.000000000 +0100
2143 +++ texinfo/intl/localcharset.h 2015-10-18 11:13:23.000000000 +0200
2144 @@ -1,3 +1,5 @@
2145 +/* $NetBSD: localcharset.h,v 1.1.1.1 2003/07/03 14:59:13 wiz Exp $ */
2146 +
2147 /* Determine a canonical name for the current locale's character encoding.
2148 Copyright (C) 2000-2003 Free Software Foundation, Inc.
2149 This file is part of the GNU CHARSET Library.
2150 diff -rNU3 texinfo.orig/intl/localealias.c texinfo/intl/localealias.c
2151 --- texinfo.orig/intl/localealias.c 2003-12-24 16:12:48.000000000 +0100
2152 +++ texinfo/intl/localealias.c 2015-10-18 11:13:23.000000000 +0200
2153 @@ -1,3 +1,5 @@
2154 +/* $NetBSD: localealias.c,v 1.1.1.5 2004/07/12 23:27:16 wiz Exp $ */
2155 +
2156 /* Handle aliases for locale names.
2157 Copyright (C) 1995-1999, 2000-2001, 2003 Free Software Foundation, Inc.
2159 diff -rNU3 texinfo.orig/intl/localename.c texinfo/intl/localename.c
2160 --- texinfo.orig/intl/localename.c 2004-04-11 19:56:46.000000000 +0200
2161 +++ texinfo/intl/localename.c 2015-10-18 11:13:23.000000000 +0200
2162 @@ -1,3 +1,5 @@
2163 +/* $NetBSD: localename.c,v 1.1.1.2 2004/07/12 23:27:16 wiz Exp $ */
2164 +
2165 /* Determine the current selected locale.
2166 Copyright (C) 1995-1999, 2000-2004 Free Software Foundation, Inc.
2168 diff -rNU3 texinfo.orig/intl/log.c texinfo/intl/log.c
2169 --- texinfo.orig/intl/log.c 2003-12-24 16:12:48.000000000 +0100
2170 +++ texinfo/intl/log.c 2015-10-18 11:13:23.000000000 +0200
2171 @@ -1,3 +1,5 @@
2172 +/* $NetBSD: log.c,v 1.1.1.2 2004/07/12 23:27:15 wiz Exp $ */
2173 +
2174 /* Log file output.
2175 Copyright (C) 2003 Free Software Foundation, Inc.
2177 diff -rNU3 texinfo.orig/intl/ngettext.c texinfo/intl/ngettext.c
2178 --- texinfo.orig/intl/ngettext.c 2003-12-24 16:12:48.000000000 +0100
2179 +++ texinfo/intl/ngettext.c 2015-10-18 11:13:23.000000000 +0200
2180 @@ -1,3 +1,5 @@
2181 +/* $NetBSD: ngettext.c,v 1.1.1.3 2004/07/12 23:27:16 wiz Exp $ */
2182 +
2183 /* Implementation of ngettext(3) function.
2184 Copyright (C) 1995, 1997, 2000-2003 Free Software Foundation, Inc.
2186 diff -rNU3 texinfo.orig/intl/os2compat.c texinfo/intl/os2compat.c
2187 --- texinfo.orig/intl/os2compat.c 2002-09-21 02:41:16.000000000 +0200
2188 +++ texinfo/intl/os2compat.c 2015-10-18 11:13:23.000000000 +0200
2189 @@ -1,3 +1,5 @@
2190 +/* $NetBSD: os2compat.c,v 1.1.1.1 2003/01/17 14:54:20 wiz Exp $ */
2191 +
2192 /* OS/2 compatibility functions.
2193 Copyright (C) 2001-2002 Free Software Foundation, Inc.
2195 diff -rNU3 texinfo.orig/intl/os2compat.h texinfo/intl/os2compat.h
2196 --- texinfo.orig/intl/os2compat.h 2002-09-21 02:41:16.000000000 +0200
2197 +++ texinfo/intl/os2compat.h 2015-10-18 11:13:23.000000000 +0200
2198 @@ -1,3 +1,5 @@
2199 +/* $NetBSD: os2compat.h,v 1.1.1.1 2003/01/17 14:54:19 wiz Exp $ */
2200 +
2201 /* OS/2 compatibility defines.
2202 This file is intended to be included from config.h
2203 Copyright (C) 2001-2002 Free Software Foundation, Inc.
2204 diff -rNU3 texinfo.orig/intl/osdep.c texinfo/intl/osdep.c
2205 --- texinfo.orig/intl/osdep.c 2002-09-03 17:51:40.000000000 +0200
2206 +++ texinfo/intl/osdep.c 2015-10-18 11:13:23.000000000 +0200
2207 @@ -1,3 +1,5 @@
2208 +/* $NetBSD: osdep.c,v 1.1.1.1 2003/01/17 14:54:20 wiz Exp $ */
2209 +
2210 /* OS dependent parts of libintl.
2211 Copyright (C) 2001-2002 Free Software Foundation, Inc.
2213 diff -rNU3 texinfo.orig/intl/plural-exp.c texinfo/intl/plural-exp.c
2214 --- texinfo.orig/intl/plural-exp.c 2003-12-24 16:12:48.000000000 +0100
2215 +++ texinfo/intl/plural-exp.c 2015-10-18 11:13:23.000000000 +0200
2216 @@ -1,3 +1,5 @@
2217 +/* $NetBSD: plural-exp.c,v 1.1.1.2 2004/07/12 23:27:16 wiz Exp $ */
2218 +
2219 /* Expression parsing for plural form selection.
2220 Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc.
2221 Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
2222 diff -rNU3 texinfo.orig/intl/plural-exp.h texinfo/intl/plural-exp.h
2223 --- texinfo.orig/intl/plural-exp.h 2003-12-24 16:12:48.000000000 +0100
2224 +++ texinfo/intl/plural-exp.h 2015-10-18 11:13:23.000000000 +0200
2225 @@ -1,3 +1,5 @@
2226 +/* $NetBSD: plural-exp.h,v 1.1.1.2 2004/07/12 23:27:17 wiz Exp $ */
2227 +
2228 /* Expression parsing and evaluation for plural form selection.
2229 Copyright (C) 2000-2003 Free Software Foundation, Inc.
2230 Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
2231 diff -rNU3 texinfo.orig/intl/plural.c texinfo/intl/plural.c
2232 --- texinfo.orig/intl/plural.c 2004-04-11 19:56:46.000000000 +0200
2233 +++ texinfo/intl/plural.c 2015-10-18 11:13:23.000000000 +0200
2234 @@ -1,3 +1,5 @@
2235 +/* $NetBSD: plural.c,v 1.1.1.3 2004/07/12 23:27:15 wiz Exp $ */
2236 +
2237 /* A Bison parser, made from plural.y
2238 by GNU bison 1.35. */
2240 diff -rNU3 texinfo.orig/intl/plural.y texinfo/intl/plural.y
2241 --- texinfo.orig/intl/plural.y 2003-12-24 16:12:48.000000000 +0100
2242 +++ texinfo/intl/plural.y 2015-10-18 11:13:23.000000000 +0200
2243 @@ -1,3 +1,5 @@
2244 +/* $NetBSD: plural.y,v 1.1.1.2 2004/07/12 23:27:16 wiz Exp $ */
2245 +
2246 %{
2247 /* Expression parsing for plural form selection.
2248 Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc.
2249 diff -rNU3 texinfo.orig/intl/printf-args.c texinfo/intl/printf-args.c
2250 --- texinfo.orig/intl/printf-args.c 2004-04-11 19:56:46.000000000 +0200
2251 +++ texinfo/intl/printf-args.c 2015-10-18 11:13:23.000000000 +0200
2252 @@ -1,3 +1,5 @@
2253 +/* $NetBSD: printf-args.c,v 1.1.1.1 2004/07/12 23:27:17 wiz Exp $ */
2254 +
2255 /* Decomposed printf argument list.
2256 Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
2258 diff -rNU3 texinfo.orig/intl/printf-args.h texinfo/intl/printf-args.h
2259 --- texinfo.orig/intl/printf-args.h 2004-04-11 19:56:46.000000000 +0200
2260 +++ texinfo/intl/printf-args.h 2015-10-18 11:13:23.000000000 +0200
2261 @@ -1,3 +1,5 @@
2262 +/* $NetBSD: printf-args.h,v 1.1.1.1 2004/07/12 23:27:17 wiz Exp $ */
2263 +
2264 /* Decomposed printf argument list.
2265 Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
2267 diff -rNU3 texinfo.orig/intl/printf-parse.c texinfo/intl/printf-parse.c
2268 --- texinfo.orig/intl/printf-parse.c 2004-04-11 19:56:46.000000000 +0200
2269 +++ texinfo/intl/printf-parse.c 2015-10-18 11:13:23.000000000 +0200
2270 @@ -1,3 +1,5 @@
2271 +/* $NetBSD: printf-parse.c,v 1.1.1.1 2004/07/12 23:27:17 wiz Exp $ */
2272 +
2273 /* Formatted output to strings.
2274 Copyright (C) 1999-2000, 2002-2003 Free Software Foundation, Inc.
2276 diff -rNU3 texinfo.orig/intl/printf-parse.h texinfo/intl/printf-parse.h
2277 --- texinfo.orig/intl/printf-parse.h 2004-04-11 19:56:46.000000000 +0200
2278 +++ texinfo/intl/printf-parse.h 2015-10-18 11:13:23.000000000 +0200
2279 @@ -1,3 +1,5 @@
2280 +/* $NetBSD: printf-parse.h,v 1.1.1.1 2004/07/12 23:27:17 wiz Exp $ */
2281 +
2282 /* Parse printf format string.
2283 Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
2285 diff -rNU3 texinfo.orig/intl/printf.c texinfo/intl/printf.c
2286 --- texinfo.orig/intl/printf.c 2004-04-11 19:56:46.000000000 +0200
2287 +++ texinfo/intl/printf.c 2015-10-18 11:13:23.000000000 +0200
2288 @@ -1,3 +1,5 @@
2289 +/* $NetBSD: printf.c,v 1.1.1.1 2004/07/12 23:27:15 wiz Exp $ */
2290 +
2291 /* Formatted output to strings, using POSIX/XSI format strings with positions.
2292 Copyright (C) 2003 Free Software Foundation, Inc.
2293 Written by Bruno Haible <bruno@clisp.org>, 2003.
2294 diff -rNU3 texinfo.orig/intl/relocatable.c texinfo/intl/relocatable.c
2295 --- texinfo.orig/intl/relocatable.c 2003-12-24 16:12:48.000000000 +0100
2296 +++ texinfo/intl/relocatable.c 2015-10-18 11:13:23.000000000 +0200
2297 @@ -1,3 +1,5 @@
2298 +/* $NetBSD: relocatable.c,v 1.1.1.2 2004/07/12 23:27:15 wiz Exp $ */
2299 +
2300 /* Provide relocatable packages.
2301 Copyright (C) 2003 Free Software Foundation, Inc.
2302 Written by Bruno Haible <bruno@clisp.org>, 2003.
2303 diff -rNU3 texinfo.orig/intl/relocatable.h texinfo/intl/relocatable.h
2304 --- texinfo.orig/intl/relocatable.h 2003-12-24 16:12:48.000000000 +0100
2305 +++ texinfo/intl/relocatable.h 2015-10-18 11:13:23.000000000 +0200
2306 @@ -1,3 +1,5 @@
2307 +/* $NetBSD: relocatable.h,v 1.1.1.2 2004/07/12 23:27:17 wiz Exp $ */
2308 +
2309 /* Provide relocatable packages.
2310 Copyright (C) 2003 Free Software Foundation, Inc.
2311 Written by Bruno Haible <bruno@clisp.org>, 2003.
2312 diff -rNU3 texinfo.orig/intl/textdomain.c texinfo/intl/textdomain.c
2313 --- texinfo.orig/intl/textdomain.c 2003-12-24 16:12:48.000000000 +0100
2314 +++ texinfo/intl/textdomain.c 2015-10-18 11:13:23.000000000 +0200
2315 @@ -1,3 +1,5 @@
2316 +/* $NetBSD: textdomain.c,v 1.1.1.4 2004/07/12 23:27:16 wiz Exp $ */
2317 +
2318 /* Implementation of the textdomain(3) function.
2319 Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
2321 diff -rNU3 texinfo.orig/intl/vasnprintf.c texinfo/intl/vasnprintf.c
2322 --- texinfo.orig/intl/vasnprintf.c 2004-04-11 19:56:46.000000000 +0200
2323 +++ texinfo/intl/vasnprintf.c 2015-10-18 11:13:23.000000000 +0200
2324 @@ -1,3 +1,5 @@
2325 +/* $NetBSD: vasnprintf.c,v 1.1.1.1 2004/07/12 23:27:17 wiz Exp $ */
2326 +
2327 /* vsprintf with automatic memory allocation.
2328 Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
2330 diff -rNU3 texinfo.orig/intl/vasnprintf.h texinfo/intl/vasnprintf.h
2331 --- texinfo.orig/intl/vasnprintf.h 2004-04-11 19:56:46.000000000 +0200
2332 +++ texinfo/intl/vasnprintf.h 2015-10-18 11:13:23.000000000 +0200
2333 @@ -1,3 +1,5 @@
2334 +/* $NetBSD: vasnprintf.h,v 1.1.1.1 2004/07/12 23:27:17 wiz Exp $ */
2335 +
2336 /* vsprintf with automatic memory allocation.
2337 Copyright (C) 2002-2003 Free Software Foundation, Inc.
2339 diff -rNU3 texinfo.orig/intl/vasnwprintf.h texinfo/intl/vasnwprintf.h
2340 --- texinfo.orig/intl/vasnwprintf.h 2004-04-11 19:56:46.000000000 +0200
2341 +++ texinfo/intl/vasnwprintf.h 2015-10-18 11:13:23.000000000 +0200
2342 @@ -1,3 +1,5 @@
2343 +/* $NetBSD: vasnwprintf.h,v 1.1.1.1 2004/07/12 23:27:17 wiz Exp $ */
2344 +
2345 /* vswprintf with automatic memory allocation.
2346 Copyright (C) 2002-2003 Free Software Foundation, Inc.
2348 diff -rNU3 texinfo.orig/intl/wprintf-parse.h texinfo/intl/wprintf-parse.h
2349 --- texinfo.orig/intl/wprintf-parse.h 2004-04-11 19:56:46.000000000 +0200
2350 +++ texinfo/intl/wprintf-parse.h 2015-10-18 11:13:23.000000000 +0200
2351 @@ -1,3 +1,5 @@
2352 +/* $NetBSD: wprintf-parse.h,v 1.1.1.1 2004/07/12 23:27:17 wiz Exp $ */
2353 +
2354 /* Parse printf format string.
2355 Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
2357 diff -rNU3 texinfo.orig/intl/xsize.h texinfo/intl/xsize.h
2358 --- texinfo.orig/intl/xsize.h 2004-04-11 19:56:46.000000000 +0200
2359 +++ texinfo/intl/xsize.h 2015-10-18 11:13:23.000000000 +0200
2360 @@ -1,3 +1,5 @@
2361 +/* $NetBSD: xsize.h,v 1.1.1.1 2004/07/12 23:27:17 wiz Exp $ */
2362 +
2363 /* xsize.h -- Checked size_t computations.
2365 Copyright (C) 2003 Free Software Foundation, Inc.
2366 diff -rNU3 texinfo.orig/lib/Makefile.am texinfo/lib/Makefile.am
2367 --- texinfo.orig/lib/Makefile.am 2004-11-06 23:05:59.000000000 +0100
2368 +++ texinfo/lib/Makefile.am 2015-10-18 11:13:23.000000000 +0200
2369 @@ -1,4 +1,4 @@
2370 -# $Id: Makefile.am,v 1.7 2004/11/06 22:05:59 karl Exp $
2371 +# Id: Makefile.am,v 1.7 2004/11/06 22:05:59 karl Exp
2372 # Makefile.am for texinfo/lib.
2373 # Run automake in .. to produce Makefile.in from this.
2374 #
2375 diff -rNU3 texinfo.orig/lib/Makefile.in texinfo/lib/Makefile.in
2376 --- texinfo.orig/lib/Makefile.in 2004-12-31 19:01:48.000000000 +0100
2377 +++ texinfo/lib/Makefile.in 2015-10-18 11:13:23.000000000 +0200
2378 @@ -14,7 +14,7 @@
2380 @SET_MAKE@
2382 -# $Id: Makefile.am,v 1.7 2004/11/06 22:05:59 karl Exp $
2383 +# Id: Makefile.am,v 1.7 2004/11/06 22:05:59 karl Exp
2384 # Makefile.am for texinfo/lib.
2385 # Run automake in .. to produce Makefile.in from this.
2386 #
2387 diff -rNU3 texinfo.orig/lib/README texinfo/lib/README
2388 --- texinfo.orig/lib/README 2004-04-11 19:56:46.000000000 +0200
2389 +++ texinfo/lib/README 2015-10-18 11:13:23.000000000 +0200
2390 @@ -1,4 +1,4 @@
2391 -$Id: README,v 1.3 2004/04/11 17:56:46 karl Exp $
2392 +Id: README,v 1.3 2004/04/11 17:56:46 karl Exp
2393 texinfo/lib/README
2395 Copyright (C) 2002 Free Software Foundation, Inc.
2396 diff -rNU3 texinfo.orig/lib/alloca.c texinfo/lib/alloca.c
2397 --- texinfo.orig/lib/alloca.c 2004-05-17 14:59:20.000000000 +0200
2398 +++ texinfo/lib/alloca.c 2015-10-18 11:13:23.000000000 +0200
2399 @@ -1,3 +1,5 @@
2400 +/* $NetBSD: alloca.c,v 1.1.1.5 2008/09/02 07:49:28 christos Exp $ */
2401 +
2402 /* alloca.c -- allocate automatically reclaimed memory
2403 (Mostly) portable public-domain implementation -- D A Gwyn
2405 diff -rNU3 texinfo.orig/lib/getopt.c texinfo/lib/getopt.c
2406 --- texinfo.orig/lib/getopt.c 2004-09-10 14:43:21.000000000 +0200
2407 +++ texinfo/lib/getopt.c 2015-10-18 11:13:23.000000000 +0200
2408 @@ -1,3 +1,5 @@
2409 +/* $NetBSD: getopt.c,v 1.7 2008/09/02 08:00:24 christos Exp $ */
2410 +
2411 /* Getopt for GNU.
2412 NOTE: getopt is now part of the C library, so if you don't know what
2413 "Keep this file name-space clean" means, talk to drepper@gnu.org
2414 diff -rNU3 texinfo.orig/lib/getopt.h texinfo/lib/getopt.h
2415 --- texinfo.orig/lib/getopt.h 2004-09-14 14:36:00.000000000 +0200
2416 +++ texinfo/lib/getopt.h 2015-10-18 11:13:23.000000000 +0200
2417 @@ -1,5 +1,7 @@
2418 +/* $NetBSD: getopt.h,v 1.1.1.6 2008/09/02 07:49:28 christos Exp $ */
2419 +
2420 /* getopt.h -- wrapper for gnulib getopt_.h.
2421 - $Id: getopt.h,v 1.6 2004/09/14 12:36:00 karl Exp $
2422 + Id: getopt.h,v 1.6 2004/09/14 12:36:00 karl Exp
2423 Copyright (C) 2004 Free Software Foundation, Inc.
2425 Copying and distribution of this file, with or without modification,
2426 diff -rNU3 texinfo.orig/lib/getopt1.c texinfo/lib/getopt1.c
2427 --- texinfo.orig/lib/getopt1.c 2004-09-10 14:43:21.000000000 +0200
2428 +++ texinfo/lib/getopt1.c 2015-10-18 11:13:23.000000000 +0200
2429 @@ -1,3 +1,5 @@
2430 +/* $NetBSD: getopt1.c,v 1.1.1.6 2008/09/02 07:49:29 christos Exp $ */
2431 +
2432 /* getopt_long and getopt_long_only entry points for GNU getopt.
2433 Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98,2004
2434 Free Software Foundation, Inc.
2435 diff -rNU3 texinfo.orig/lib/getopt_.h texinfo/lib/getopt_.h
2436 --- texinfo.orig/lib/getopt_.h 2004-09-14 14:36:00.000000000 +0200
2437 +++ texinfo/lib/getopt_.h 2015-10-18 11:13:23.000000000 +0200
2438 @@ -1,3 +1,5 @@
2439 +/* $NetBSD: getopt_.h,v 1.1.1.1 2008/09/02 07:49:31 christos Exp $ */
2440 +
2441 /* Declarations for getopt.
2442 Copyright (C) 1989-1994,1996-1999,2001,2003,2004
2443 Free Software Foundation, Inc.
2444 diff -rNU3 texinfo.orig/lib/getopt_int.h texinfo/lib/getopt_int.h
2445 --- texinfo.orig/lib/getopt_int.h 2004-04-11 19:56:46.000000000 +0200
2446 +++ texinfo/lib/getopt_int.h 2015-10-18 11:13:23.000000000 +0200
2447 @@ -1,3 +1,5 @@
2448 +/* $NetBSD: getopt_int.h,v 1.1.1.1 2004/07/12 23:26:57 wiz Exp $ */
2449 +
2450 /* Internal declarations for getopt.
2451 Copyright (C) 1989-1994,1996-1999,2001,2003,2004
2452 Free Software Foundation, Inc.
2453 diff -rNU3 texinfo.orig/lib/gettext.h texinfo/lib/gettext.h
2454 --- texinfo.orig/lib/gettext.h 2003-07-17 15:11:25.000000000 +0200
2455 +++ texinfo/lib/gettext.h 2015-10-18 11:13:23.000000000 +0200
2456 @@ -1,3 +1,5 @@
2457 +/* $NetBSD: gettext.h,v 1.1.1.2 2004/07/12 23:26:56 wiz Exp $ */
2458 +
2459 /* Convenience header for conditional use of GNU <libintl.h>.
2460 Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc.
2462 diff -rNU3 texinfo.orig/lib/memcpy.c texinfo/lib/memcpy.c
2463 --- texinfo.orig/lib/memcpy.c 2003-09-10 15:17:12.000000000 +0200
2464 +++ texinfo/lib/memcpy.c 2015-10-18 11:13:23.000000000 +0200
2465 @@ -1,3 +1,5 @@
2466 +/* $NetBSD: memcpy.c,v 1.1.1.3 2004/07/12 23:26:57 wiz Exp $ */
2467 +
2468 /* Copyright (C) 1995, 1997, 2000, 2003 Free Software Foundation, Inc.
2470 This program is free software; you can redistribute it and/or modify
2471 diff -rNU3 texinfo.orig/lib/memmove.c texinfo/lib/memmove.c
2472 --- texinfo.orig/lib/memmove.c 2003-09-10 15:17:12.000000000 +0200
2473 +++ texinfo/lib/memmove.c 2015-10-18 11:13:23.000000000 +0200
2474 @@ -1,3 +1,5 @@
2475 +/* $NetBSD: memmove.c,v 1.1.1.3 2004/07/12 23:26:57 wiz Exp $ */
2476 +
2477 /* memmove.c -- copy memory.
2478 Copy LENGTH bytes from SOURCE to DEST. Does not null-terminate.
2479 In the public domain.
2480 diff -rNU3 texinfo.orig/lib/mkstemp.c texinfo/lib/mkstemp.c
2481 --- texinfo.orig/lib/mkstemp.c 2003-07-17 15:11:25.000000000 +0200
2482 +++ texinfo/lib/mkstemp.c 2015-10-18 11:13:23.000000000 +0200
2483 @@ -1,3 +1,5 @@
2484 +/* $NetBSD: mkstemp.c,v 1.1.1.2 2004/07/12 23:26:57 wiz Exp $ */
2485 +
2486 /* Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc.
2487 This file is derived from the one in the GNU C Library.
2489 diff -rNU3 texinfo.orig/lib/strcase.h texinfo/lib/strcase.h
2490 --- texinfo.orig/lib/strcase.h 2004-04-11 20:13:34.000000000 +0200
2491 +++ texinfo/lib/strcase.h 2015-10-18 11:13:23.000000000 +0200
2492 @@ -1,3 +1,5 @@
2493 +/* $NetBSD: strcase.h,v 1.1.1.1 2008/09/02 07:49:31 christos Exp $ */
2494 +
2495 /* Case-insensitive string comparison functions.
2496 Copyright (C) 1995-1996, 2001, 2003 Free Software Foundation, Inc.
2498 diff -rNU3 texinfo.orig/lib/strcasecmp.c texinfo/lib/strcasecmp.c
2499 --- texinfo.orig/lib/strcasecmp.c 2003-06-06 14:19:59.000000000 +0200
2500 +++ texinfo/lib/strcasecmp.c 2015-10-18 11:13:23.000000000 +0200
2501 @@ -1,3 +1,5 @@
2502 +/* $NetBSD: strcasecmp.c,v 1.1.1.3 2003/07/03 14:58:58 wiz Exp $ */
2503 +
2504 /* strcasecmp.c -- case insensitive string comparator
2505 Copyright (C) 1998, 1999 Free Software Foundation, Inc.
2507 diff -rNU3 texinfo.orig/lib/strdup.c texinfo/lib/strdup.c
2508 --- texinfo.orig/lib/strdup.c 2004-09-14 14:36:50.000000000 +0200
2509 +++ texinfo/lib/strdup.c 2015-10-18 11:13:23.000000000 +0200
2510 @@ -1,3 +1,5 @@
2511 +/* $NetBSD: strdup.c,v 1.1.1.5 2008/09/02 07:49:28 christos Exp $ */
2512 +
2513 /* Copyright (C) 1991, 1996, 1997, 1998, 2002, 2003, 2004 Free Software
2514 Foundation, Inc.
2516 diff -rNU3 texinfo.orig/lib/strdup.h texinfo/lib/strdup.h
2517 --- texinfo.orig/lib/strdup.h 2004-04-11 20:13:34.000000000 +0200
2518 +++ texinfo/lib/strdup.h 2015-10-18 11:13:23.000000000 +0200
2519 @@ -1,3 +1,5 @@
2520 +/* $NetBSD: strdup.h,v 1.1.1.1 2008/09/02 07:49:31 christos Exp $ */
2521 +
2522 /* strdup.h -- duplicate a string
2523 Copyright (C) 2004 Free Software Foundation, Inc.
2525 diff -rNU3 texinfo.orig/lib/strerror.c texinfo/lib/strerror.c
2526 --- texinfo.orig/lib/strerror.c 2003-08-03 15:09:35.000000000 +0200
2527 +++ texinfo/lib/strerror.c 2015-10-18 11:13:23.000000000 +0200
2528 @@ -1,3 +1,5 @@
2529 +/* $NetBSD: strerror.c,v 1.1.1.3 2004/07/12 23:26:57 wiz Exp $ */
2530 +
2531 /* strerror.c --- ANSI C compatible system error routine
2533 Copyright (C) 1986, 1988, 1989, 1991, 2002, 2003 Free Software
2534 diff -rNU3 texinfo.orig/lib/strncasecmp.c texinfo/lib/strncasecmp.c
2535 --- texinfo.orig/lib/strncasecmp.c 2002-09-03 17:51:40.000000000 +0200
2536 +++ texinfo/lib/strncasecmp.c 2015-10-18 11:13:23.000000000 +0200
2537 @@ -1,2 +1,4 @@
2538 +/* $NetBSD: strncasecmp.c,v 1.1.1.2 2003/01/17 14:54:30 wiz Exp $ */
2539 +
2540 #define LENGTH_LIMIT
2541 #include "strcasecmp.c"
2542 diff -rNU3 texinfo.orig/lib/substring.c texinfo/lib/substring.c
2543 --- texinfo.orig/lib/substring.c 2004-04-11 19:56:46.000000000 +0200
2544 +++ texinfo/lib/substring.c 2015-10-18 11:13:23.000000000 +0200
2545 @@ -1,5 +1,7 @@
2546 +/* $NetBSD: substring.c,v 1.1.1.4 2008/09/02 07:49:29 christos Exp $ */
2547 +
2548 /* substring.c -- extract substring.
2549 - $Id: substring.c,v 1.2 2004/04/11 17:56:46 karl Exp $
2550 + Id: substring.c,v 1.2 2004/04/11 17:56:46 karl Exp
2552 Copyright (C) 1999, 2004 Free Software Foundation, Inc.
2554 diff -rNU3 texinfo.orig/lib/system.h texinfo/lib/system.h
2555 --- texinfo.orig/lib/system.h 2004-04-26 15:56:57.000000000 +0200
2556 +++ texinfo/lib/system.h 2015-10-18 11:13:23.000000000 +0200
2557 @@ -1,5 +1,7 @@
2558 +/* $NetBSD: system.h,v 1.11 2009/03/06 17:03:48 apb Exp $ */
2559 +
2560 /* system.h: system-dependent declarations; include this first.
2561 - $Id: system.h,v 1.12 2004/04/26 13:56:57 karl Exp $
2562 + Id: system.h,v 1.12 2004/04/26 13:56:57 karl Exp
2564 Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
2565 Foundation, Inc.
2566 @@ -267,6 +269,10 @@
2567 /* Some systems don't declare this function in pwd.h. */
2568 struct passwd *getpwnam (const char *name);
2570 +#ifdef HAVE_STDINT_H
2571 +#include <stdint.h>
2572 +#endif
2573 +
2574 /* Our library routines not included in any system library. */
2575 extern void *xmalloc (size_t), *xrealloc (void *, size_t);
2576 extern char *xstrdup (const char *);
2577 diff -rNU3 texinfo.orig/lib/tempname.c texinfo/lib/tempname.c
2578 --- texinfo.orig/lib/tempname.c 2003-09-15 15:25:45.000000000 +0200
2579 +++ texinfo/lib/tempname.c 2015-10-18 11:13:23.000000000 +0200
2580 @@ -1,3 +1,5 @@
2581 +/* $NetBSD: tempname.c,v 1.1.1.4 2004/07/12 23:26:57 wiz Exp $ */
2582 +
2583 /* tempname.c - generate the name of a temporary file.
2585 Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
2586 diff -rNU3 texinfo.orig/lib/xalloc.h texinfo/lib/xalloc.h
2587 --- texinfo.orig/lib/xalloc.h 2004-09-10 14:43:21.000000000 +0200
2588 +++ texinfo/lib/xalloc.h 2015-10-18 11:13:23.000000000 +0200
2589 @@ -1,3 +1,5 @@
2590 +/* $NetBSD: xalloc.h,v 1.1.1.4 2008/09/02 07:49:31 christos Exp $ */
2591 +
2592 /* xalloc.h -- malloc with out-of-memory checking
2594 Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
2595 diff -rNU3 texinfo.orig/lib/xexit.c texinfo/lib/xexit.c
2596 --- texinfo.orig/lib/xexit.c 2004-04-11 19:56:46.000000000 +0200
2597 +++ texinfo/lib/xexit.c 2015-10-18 11:13:23.000000000 +0200
2598 @@ -1,5 +1,7 @@
2599 +/* $NetBSD: xexit.c,v 1.1.1.5 2008/09/02 07:49:31 christos Exp $ */
2600 +
2601 /* xexit.c -- exit with attention to return values and closing stdout.
2602 - $Id: xexit.c,v 1.5 2004/04/11 17:56:46 karl Exp $
2603 + Id: xexit.c,v 1.5 2004/04/11 17:56:46 karl Exp
2605 Copyright (C) 1999, 2003, 2004 Free Software Foundation, Inc.
2607 diff -rNU3 texinfo.orig/lib/xmalloc.c texinfo/lib/xmalloc.c
2608 --- texinfo.orig/lib/xmalloc.c 2004-04-11 19:56:46.000000000 +0200
2609 +++ texinfo/lib/xmalloc.c 2015-10-18 11:13:23.000000000 +0200
2610 @@ -1,3 +1,5 @@
2611 +/* $NetBSD: xmalloc.c,v 1.1.1.3 2004/07/12 23:26:56 wiz Exp $ */
2612 +
2613 /* xmalloc.c -- safe versions of malloc and realloc.
2615 Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 2004 Free Software
2616 diff -rNU3 texinfo.orig/lib/xstrdup.c texinfo/lib/xstrdup.c
2617 --- texinfo.orig/lib/xstrdup.c 2003-10-14 20:22:07.000000000 +0200
2618 +++ texinfo/lib/xstrdup.c 2015-10-18 11:13:23.000000000 +0200
2619 @@ -1,3 +1,5 @@
2620 +/* $NetBSD: xstrdup.c,v 1.1.1.3 2004/07/12 23:26:56 wiz Exp $ */
2621 +
2622 /* xstrdup.c -- copy a string with out of memory checking
2623 Copyright (C) 1990, 1996, 1998, 2001, 2003 Free Software Foundation, Inc.
2625 diff -rNU3 texinfo.orig/makeinfo/Makefile.am texinfo/makeinfo/Makefile.am
2626 --- texinfo.orig/makeinfo/Makefile.am 2004-04-11 19:56:46.000000000 +0200
2627 +++ texinfo/makeinfo/Makefile.am 2015-10-18 11:13:23.000000000 +0200
2628 @@ -1,4 +1,4 @@
2629 -# $Id: Makefile.am,v 1.5 2004/04/11 17:56:46 karl Exp $
2630 +# Id: Makefile.am,v 1.5 2004/04/11 17:56:46 karl Exp
2631 # Makefile.am for texinfo/makeinfo.
2632 # Run automake in .. to produce Makefile.in from this.
2633 #
2634 diff -rNU3 texinfo.orig/makeinfo/Makefile.in texinfo/makeinfo/Makefile.in
2635 --- texinfo.orig/makeinfo/Makefile.in 2004-12-31 19:01:48.000000000 +0100
2636 +++ texinfo/makeinfo/Makefile.in 2015-10-18 11:13:23.000000000 +0200
2637 @@ -14,7 +14,7 @@
2639 @SET_MAKE@
2641 -# $Id: Makefile.am,v 1.5 2004/04/11 17:56:46 karl Exp $
2642 +# Id: Makefile.am,v 1.5 2004/04/11 17:56:46 karl Exp
2643 # Makefile.am for texinfo/makeinfo.
2644 # Run automake in .. to produce Makefile.in from this.
2645 #
2646 diff -rNU3 texinfo.orig/makeinfo/README texinfo/makeinfo/README
2647 --- texinfo.orig/makeinfo/README 2004-04-11 19:56:46.000000000 +0200
2648 +++ texinfo/makeinfo/README 2015-10-18 11:13:23.000000000 +0200
2649 @@ -1,4 +1,4 @@
2650 -$Id: README,v 1.3 2004/04/11 17:56:46 karl Exp $
2651 +Id: README,v 1.3 2004/04/11 17:56:46 karl Exp
2652 texinfo/makeinfo/README
2654 Copyright (C) 2002 Free Software Foundation, Inc.
2655 diff -rNU3 texinfo.orig/makeinfo/cmds.c texinfo/makeinfo/cmds.c
2656 --- texinfo.orig/makeinfo/cmds.c 2004-12-14 01:15:36.000000000 +0100
2657 +++ texinfo/makeinfo/cmds.c 2015-10-18 11:13:23.000000000 +0200
2658 @@ -1,5 +1,7 @@
2659 +/* $NetBSD: cmds.c,v 1.3 2008/09/02 08:00:24 christos Exp $ */
2660 +
2661 /* cmds.c -- Texinfo commands.
2662 - $Id: cmds.c,v 1.55 2004/12/14 00:15:36 karl Exp $
2663 + Id: cmds.c,v 1.55 2004/12/14 00:15:36 karl Exp
2665 Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
2666 Foundation, Inc.
2667 diff -rNU3 texinfo.orig/makeinfo/cmds.h texinfo/makeinfo/cmds.h
2668 --- texinfo.orig/makeinfo/cmds.h 2004-11-26 01:48:35.000000000 +0100
2669 +++ texinfo/makeinfo/cmds.h 2015-10-18 11:13:23.000000000 +0200
2670 @@ -1,5 +1,7 @@
2671 +/* $NetBSD: cmds.h,v 1.1.1.4 2008/09/02 07:50:24 christos Exp $ */
2672 +
2673 /* cmds.h -- declarations for cmds.c.
2674 - $Id: cmds.h,v 1.9 2004/11/26 00:48:35 karl Exp $
2675 + Id: cmds.h,v 1.9 2004/11/26 00:48:35 karl Exp
2677 Copyright (C) 1998, 1999, 2002, 2003, 2004 Free Software Foundation,
2678 Inc.
2679 diff -rNU3 texinfo.orig/makeinfo/defun.c texinfo/makeinfo/defun.c
2680 --- texinfo.orig/makeinfo/defun.c 2004-04-11 19:56:46.000000000 +0200
2681 +++ texinfo/makeinfo/defun.c 2015-10-18 11:13:23.000000000 +0200
2682 @@ -1,5 +1,7 @@
2683 +/* $NetBSD: defun.c,v 1.1.1.5 2008/09/02 07:50:24 christos Exp $ */
2684 +
2685 /* defun.c -- @defun and friends.
2686 - $Id: defun.c,v 1.11 2004/04/11 17:56:46 karl Exp $
2687 + Id: defun.c,v 1.11 2004/04/11 17:56:46 karl Exp
2689 Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
2690 Foundation, Inc.
2691 diff -rNU3 texinfo.orig/makeinfo/defun.h texinfo/makeinfo/defun.h
2692 --- texinfo.orig/makeinfo/defun.h 2004-04-11 19:56:47.000000000 +0200
2693 +++ texinfo/makeinfo/defun.h 2015-10-18 11:13:23.000000000 +0200
2694 @@ -1,5 +1,7 @@
2695 +/* $NetBSD: defun.h,v 1.1.1.4 2008/09/02 07:50:26 christos Exp $ */
2696 +
2697 /* defun.h -- declaration for defuns.
2698 - $Id: defun.h,v 1.2 2004/04/11 17:56:47 karl Exp $
2699 + Id: defun.h,v 1.2 2004/04/11 17:56:47 karl Exp
2701 Copyright (C) 1999 Free Software Foundation, Inc.
2703 diff -rNU3 texinfo.orig/makeinfo/files.c texinfo/makeinfo/files.c
2704 --- texinfo.orig/makeinfo/files.c 2004-07-27 02:06:31.000000000 +0200
2705 +++ texinfo/makeinfo/files.c 2015-10-18 11:13:23.000000000 +0200
2706 @@ -1,5 +1,7 @@
2707 +/* $NetBSD: files.c,v 1.10 2015/06/05 16:44:56 joerg Exp $ */
2708 +
2709 /* files.c -- file-related functions for makeinfo.
2710 - $Id: files.c,v 1.5 2004/07/27 00:06:31 karl Exp $
2711 + Id: files.c,v 1.5 2004/07/27 00:06:31 karl Exp
2713 Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
2714 Foundation, Inc.
2715 @@ -456,8 +458,7 @@
2716 temp_home = (char *) getenv ("HOME");
2717 result = xmalloc (strlen (&filename[1])
2718 + 1
2719 - + temp_home ? strlen (temp_home)
2720 - : 0);
2721 + + (temp_home ? strlen (temp_home) : 0));
2722 *result = 0;
2724 if (temp_home)
2725 diff -rNU3 texinfo.orig/makeinfo/files.h texinfo/makeinfo/files.h
2726 --- texinfo.orig/makeinfo/files.h 2004-07-27 02:06:31.000000000 +0200
2727 +++ texinfo/makeinfo/files.h 2015-10-18 11:13:23.000000000 +0200
2728 @@ -1,5 +1,7 @@
2729 +/* $NetBSD: files.h,v 1.3 2008/09/02 08:00:24 christos Exp $ */
2730 +
2731 /* files.h -- declarations for files.c.
2732 - $Id: files.h,v 1.4 2004/07/27 00:06:31 karl Exp $
2733 + Id: files.h,v 1.4 2004/07/27 00:06:31 karl Exp
2735 Copyright (C) 1998, 2002, 2004 Free Software Foundation, Inc.
2737 diff -rNU3 texinfo.orig/makeinfo/float.c texinfo/makeinfo/float.c
2738 --- texinfo.orig/makeinfo/float.c 2004-07-06 00:23:22.000000000 +0200
2739 +++ texinfo/makeinfo/float.c 2015-10-18 11:13:23.000000000 +0200
2740 @@ -1,5 +1,7 @@
2741 +/* $NetBSD: float.c,v 1.1.1.2 2008/09/02 07:50:28 christos Exp $ */
2742 +
2743 /* float.c -- float environment functions.
2744 - $Id: float.c,v 1.8 2004/07/05 22:23:22 karl Exp $
2745 + Id: float.c,v 1.8 2004/07/05 22:23:22 karl Exp
2747 Copyright (C) 2003, 2004 Free Software Foundation, Inc.
2749 diff -rNU3 texinfo.orig/makeinfo/float.h texinfo/makeinfo/float.h
2750 --- texinfo.orig/makeinfo/float.h 2004-04-11 19:56:47.000000000 +0200
2751 +++ texinfo/makeinfo/float.h 2015-10-18 11:13:23.000000000 +0200
2752 @@ -1,5 +1,7 @@
2753 +/* $NetBSD: float.h,v 1.1.1.2 2008/09/02 07:50:28 christos Exp $ */
2754 +
2755 /* float.h -- declarations for the float environment.
2756 - $Id: float.h,v 1.5 2004/04/11 17:56:47 karl Exp $
2757 + Id: float.h,v 1.5 2004/04/11 17:56:47 karl Exp
2759 Copyright (C) 2003, 2004 Free Software Foundation, Inc.
2761 diff -rNU3 texinfo.orig/makeinfo/footnote.c texinfo/makeinfo/footnote.c
2762 --- texinfo.orig/makeinfo/footnote.c 2004-04-11 19:56:47.000000000 +0200
2763 +++ texinfo/makeinfo/footnote.c 2015-10-18 11:13:23.000000000 +0200
2764 @@ -1,5 +1,7 @@
2765 +/* $NetBSD: footnote.c,v 1.1.1.4 2008/09/02 07:50:28 christos Exp $ */
2766 +
2767 /* footnote.c -- footnotes for Texinfo.
2768 - $Id: footnote.c,v 1.7 2004/04/11 17:56:47 karl Exp $
2769 + Id: footnote.c,v 1.7 2004/04/11 17:56:47 karl Exp
2771 Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
2773 diff -rNU3 texinfo.orig/makeinfo/footnote.h texinfo/makeinfo/footnote.h
2774 --- texinfo.orig/makeinfo/footnote.h 2004-04-11 19:56:47.000000000 +0200
2775 +++ texinfo/makeinfo/footnote.h 2015-10-18 11:13:23.000000000 +0200
2776 @@ -1,5 +1,7 @@
2777 +/* $NetBSD: footnote.h,v 1.1.1.4 2008/09/02 07:50:28 christos Exp $ */
2778 +
2779 /* footnote.h -- declarations for footnote.c.
2780 - $Id: footnote.h,v 1.2 2004/04/11 17:56:47 karl Exp $
2781 + Id: footnote.h,v 1.2 2004/04/11 17:56:47 karl Exp
2783 Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
2784 Foundation, Inc.
2785 diff -rNU3 texinfo.orig/makeinfo/html.c texinfo/makeinfo/html.c
2786 --- texinfo.orig/makeinfo/html.c 2004-12-06 02:13:06.000000000 +0100
2787 +++ texinfo/makeinfo/html.c 2015-10-18 11:13:23.000000000 +0200
2788 @@ -1,5 +1,7 @@
2789 +/* $NetBSD: html.c,v 1.1.1.5 2008/09/02 07:50:29 christos Exp $ */
2790 +
2791 /* html.c -- html-related utilities.
2792 - $Id: html.c,v 1.28 2004/12/06 01:13:06 karl Exp $
2793 + Id: html.c,v 1.28 2004/12/06 01:13:06 karl Exp
2795 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software
2796 Foundation, Inc.
2797 diff -rNU3 texinfo.orig/makeinfo/html.h texinfo/makeinfo/html.h
2798 --- texinfo.orig/makeinfo/html.h 2004-11-30 03:03:23.000000000 +0100
2799 +++ texinfo/makeinfo/html.h 2015-10-18 11:13:23.000000000 +0200
2800 @@ -1,5 +1,7 @@
2801 +/* $NetBSD: html.h,v 1.1.1.4 2008/09/02 07:50:29 christos Exp $ */
2802 +
2803 /* html.h -- declarations for html-related utilities.
2804 - $Id: html.h,v 1.6 2004/11/30 02:03:23 karl Exp $
2805 + Id: html.h,v 1.6 2004/11/30 02:03:23 karl Exp
2807 Copyright (C) 1999, 2000, 2002, 2004 Free Software Foundation, Inc.
2809 diff -rNU3 texinfo.orig/makeinfo/index.c texinfo/makeinfo/index.c
2810 --- texinfo.orig/makeinfo/index.c 2004-11-30 03:03:23.000000000 +0100
2811 +++ texinfo/makeinfo/index.c 2015-10-18 11:13:23.000000000 +0200
2812 @@ -1,5 +1,7 @@
2813 +/* $NetBSD: index.c,v 1.1.1.6 2008/09/02 07:50:31 christos Exp $ */
2814 +
2815 /* index.c -- indexing for Texinfo.
2816 - $Id: index.c,v 1.17 2004/11/30 02:03:23 karl Exp $
2817 + Id: index.c,v 1.17 2004/11/30 02:03:23 karl Exp
2819 Copyright (C) 1998, 1999, 2002, 2003, 2004 Free Software Foundation,
2820 Inc.
2821 diff -rNU3 texinfo.orig/makeinfo/index.h texinfo/makeinfo/index.h
2822 --- texinfo.orig/makeinfo/index.h 2004-04-11 19:56:47.000000000 +0200
2823 +++ texinfo/makeinfo/index.h 2015-10-18 11:13:23.000000000 +0200
2824 @@ -1,5 +1,7 @@
2825 +/* $NetBSD: index.h,v 1.1.1.4 2008/09/02 07:50:31 christos Exp $ */
2826 +
2827 /* index.h -- declarations for index.c.
2828 - $Id: index.h,v 1.2 2004/04/11 17:56:47 karl Exp $
2829 + Id: index.h,v 1.2 2004/04/11 17:56:47 karl Exp
2831 Copyright (C) 1998, 99 Free Software Foundation, Inc.
2833 diff -rNU3 texinfo.orig/makeinfo/insertion.c texinfo/makeinfo/insertion.c
2834 --- texinfo.orig/makeinfo/insertion.c 2004-11-11 19:34:28.000000000 +0100
2835 +++ texinfo/makeinfo/insertion.c 2015-10-18 11:13:23.000000000 +0200
2836 @@ -1,5 +1,7 @@
2837 +/* $NetBSD: insertion.c,v 1.1.1.6 2008/09/02 07:50:34 christos Exp $ */
2838 +
2839 /* insertion.c -- insertions for Texinfo.
2840 - $Id: insertion.c,v 1.55 2004/11/11 18:34:28 karl Exp $
2841 + Id: insertion.c,v 1.55 2004/11/11 18:34:28 karl Exp
2843 Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
2844 Foundation, Inc.
2845 diff -rNU3 texinfo.orig/makeinfo/insertion.h texinfo/makeinfo/insertion.h
2846 --- texinfo.orig/makeinfo/insertion.h 2004-04-11 19:56:47.000000000 +0200
2847 +++ texinfo/makeinfo/insertion.h 2015-10-18 11:13:23.000000000 +0200
2848 @@ -1,5 +1,7 @@
2849 +/* $NetBSD: insertion.h,v 1.1.1.4 2008/09/02 07:50:34 christos Exp $ */
2850 +
2851 /* insertion.h -- declarations for insertion.c.
2852 - $Id: insertion.h,v 1.10 2004/04/11 17:56:47 karl Exp $
2853 + Id: insertion.h,v 1.10 2004/04/11 17:56:47 karl Exp
2855 Copyright (C) 1998, 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
2857 diff -rNU3 texinfo.orig/makeinfo/lang.c texinfo/makeinfo/lang.c
2858 --- texinfo.orig/makeinfo/lang.c 2004-11-23 00:57:33.000000000 +0100
2859 +++ texinfo/makeinfo/lang.c 2015-10-18 11:13:23.000000000 +0200
2860 @@ -1,5 +1,7 @@
2861 +/* $NetBSD: lang.c,v 1.1.1.5 2008/09/02 07:50:36 christos Exp $ */
2862 +
2863 /* lang.c -- language-dependent support.
2864 - $Id: lang.c,v 1.14 2004/11/22 23:57:33 karl Exp $
2865 + Id: lang.c,v 1.14 2004/11/22 23:57:33 karl Exp
2867 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software
2868 Foundation, Inc.
2869 diff -rNU3 texinfo.orig/makeinfo/lang.h texinfo/makeinfo/lang.h
2870 --- texinfo.orig/makeinfo/lang.h 2004-04-11 19:56:47.000000000 +0200
2871 +++ texinfo/makeinfo/lang.h 2015-10-18 11:13:23.000000000 +0200
2872 @@ -1,5 +1,7 @@
2873 +/* $NetBSD: lang.h,v 1.1.1.5 2008/09/02 07:50:36 christos Exp $ */
2874 +
2875 /* lang.h -- declarations for language codes etc.
2876 - $Id: lang.h,v 1.6 2004/04/11 17:56:47 karl Exp $
2877 + Id: lang.h,v 1.6 2004/04/11 17:56:47 karl Exp
2879 Copyright (C) 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
2881 diff -rNU3 texinfo.orig/makeinfo/macro.c texinfo/makeinfo/macro.c
2882 --- texinfo.orig/makeinfo/macro.c 2004-04-11 19:56:47.000000000 +0200
2883 +++ texinfo/makeinfo/macro.c 2015-10-18 11:13:23.000000000 +0200
2884 @@ -1,5 +1,7 @@
2885 +/* $NetBSD: macro.c,v 1.1.1.5 2008/09/02 07:50:37 christos Exp $ */
2886 +
2887 /* macro.c -- user-defined macros for Texinfo.
2888 - $Id: macro.c,v 1.6 2004/04/11 17:56:47 karl Exp $
2889 + Id: macro.c,v 1.6 2004/04/11 17:56:47 karl Exp
2891 Copyright (C) 1998, 1999, 2002, 2003 Free Software Foundation, Inc.
2893 diff -rNU3 texinfo.orig/makeinfo/macro.h texinfo/makeinfo/macro.h
2894 --- texinfo.orig/makeinfo/macro.h 2004-04-11 19:56:47.000000000 +0200
2895 +++ texinfo/makeinfo/macro.h 2015-10-18 11:13:23.000000000 +0200
2896 @@ -1,5 +1,7 @@
2897 +/* $NetBSD: macro.h,v 1.1.1.4 2008/09/02 07:50:37 christos Exp $ */
2898 +
2899 /* macro.h -- declarations for macro.c.
2900 - $Id: macro.h,v 1.2 2004/04/11 17:56:47 karl Exp $
2901 + Id: macro.h,v 1.2 2004/04/11 17:56:47 karl Exp
2903 Copyright (C) 1998, 99 Free Software Foundation, Inc.
2905 diff -rNU3 texinfo.orig/makeinfo/makeinfo.c texinfo/makeinfo/makeinfo.c
2906 --- texinfo.orig/makeinfo/makeinfo.c 2004-12-19 18:15:42.000000000 +0100
2907 +++ texinfo/makeinfo/makeinfo.c 2015-10-18 11:13:23.000000000 +0200
2908 @@ -1,5 +1,7 @@
2909 +/* $NetBSD: makeinfo.c,v 1.16 2009/02/28 19:51:13 joerg Exp $ */
2910 +
2911 /* makeinfo -- convert Texinfo source into other formats.
2912 - $Id: makeinfo.c,v 1.74 2004/12/19 17:15:42 karl Exp $
2913 + Id: makeinfo.c,v 1.74 2004/12/19 17:15:42 karl Exp
2915 Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
2916 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
2917 @@ -379,6 +381,8 @@
2918 also, write to standard output by default.\n\
2919 --no-split suppress splitting of Info or HTML output,\n\
2920 generate only one output file.\n\
2921 + --no-version-headers suppress header with makeinfo version and\n\
2922 + source path.\n\
2923 --number-sections output chapter and sectioning numbers.\n\
2924 -o, --output=FILE output to FILE (directory if split HTML),\n\
2925 "));
2926 @@ -503,6 +507,7 @@
2927 { "no-pointer-validate", 0, &validating, 0 },
2928 { "no-split", 0, &splitting, 0 },
2929 { "no-validate", 0, &validating, 0 },
2930 + { "no-version-header", 0, &no_version_header, 1 },
2931 { "no-warn", 0, &print_warnings, 0 },
2932 { "number-footnotes", 0, &number_footnotes, 1 },
2933 { "number-sections", 0, &number_sections, 1 },
2934 @@ -1669,7 +1674,7 @@
2935 }
2937 /* html fixxme: should output this as trailer on first page. */
2938 - if (!no_headers && !html && !xml)
2939 + if (!no_headers && !html && !xml && !no_version_header)
2940 add_word_args (_("This is %s, produced by makeinfo version %s from %s.\n"),
2941 output_filename, VERSION, input_filename);
2943 diff -rNU3 texinfo.orig/makeinfo/makeinfo.h texinfo/makeinfo/makeinfo.h
2944 --- texinfo.orig/makeinfo/makeinfo.h 2004-11-30 03:03:23.000000000 +0100
2945 +++ texinfo/makeinfo/makeinfo.h 2015-10-18 11:13:23.000000000 +0200
2946 @@ -1,5 +1,7 @@
2947 +/* $NetBSD: makeinfo.h,v 1.2 2009/02/28 19:14:15 joerg Exp $ */
2948 +
2949 /* makeinfo.h -- declarations for Makeinfo.
2950 - $Id: makeinfo.h,v 1.17 2004/11/30 02:03:23 karl Exp $
2951 + Id: makeinfo.h,v 1.17 2004/11/30 02:03:23 karl Exp
2953 Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free
2954 Software Foundation, Inc.
2955 @@ -190,6 +192,10 @@
2956 is, generate plain text. (--no-headers) */
2957 DECLARE (int, no_headers, 0);
2959 +/* Nonzero means do not output makeinfo version and source file.
2960 + (--no-version-header) */
2961 +DECLARE (int, no_version_header, 0);
2962 +
2963 /* Nonzero means that we process @docbook and @ifdocbook. (--ifdocbook) */
2964 DECLARE (int, process_docbook, 0);
2966 diff -rNU3 texinfo.orig/makeinfo/multi.c texinfo/makeinfo/multi.c
2967 --- texinfo.orig/makeinfo/multi.c 2004-04-11 19:56:47.000000000 +0200
2968 +++ texinfo/makeinfo/multi.c 2015-10-18 11:13:23.000000000 +0200
2969 @@ -1,5 +1,7 @@
2970 +/* $NetBSD: multi.c,v 1.1.1.5 2008/09/02 07:50:44 christos Exp $ */
2971 +
2972 /* multi.c -- multiple-column tables (@multitable) for makeinfo.
2973 - $Id: multi.c,v 1.8 2004/04/11 17:56:47 karl Exp $
2974 + Id: multi.c,v 1.8 2004/04/11 17:56:47 karl Exp
2976 Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004 Free Software
2977 Foundation, Inc.
2978 diff -rNU3 texinfo.orig/makeinfo/multi.h texinfo/makeinfo/multi.h
2979 --- texinfo.orig/makeinfo/multi.h 2004-04-11 19:56:47.000000000 +0200
2980 +++ texinfo/makeinfo/multi.h 2015-10-18 11:13:23.000000000 +0200
2981 @@ -1,5 +1,7 @@
2982 +/* $NetBSD: multi.h,v 1.1.1.2 2008/09/02 07:50:44 christos Exp $ */
2983 +
2984 /* multi.h -- declarations for multi.c.
2985 - $Id: multi.h,v 1.1 2004/04/11 17:56:47 karl Exp $
2986 + Id: multi.h,v 1.1 2004/04/11 17:56:47 karl Exp
2988 Copyright (C) 2004 Free Software Foundation, Inc.
2990 diff -rNU3 texinfo.orig/makeinfo/node.c texinfo/makeinfo/node.c
2991 --- texinfo.orig/makeinfo/node.c 2004-12-21 00:56:07.000000000 +0100
2992 +++ texinfo/makeinfo/node.c 2015-10-18 11:13:23.000000000 +0200
2993 @@ -1,5 +1,7 @@
2994 +/* $NetBSD: node.c,v 1.4 2008/09/02 08:00:24 christos Exp $ */
2995 +
2996 /* node.c -- nodes for Texinfo.
2997 - $Id: node.c,v 1.27 2004/12/20 23:56:07 karl Exp $
2998 + Id: node.c,v 1.27 2004/12/20 23:56:07 karl Exp
3000 Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
3001 Foundation, Inc.
3002 diff -rNU3 texinfo.orig/makeinfo/node.h texinfo/makeinfo/node.h
3003 --- texinfo.orig/makeinfo/node.h 2004-04-11 19:56:47.000000000 +0200
3004 +++ texinfo/makeinfo/node.h 2015-10-18 11:13:23.000000000 +0200
3005 @@ -1,5 +1,7 @@
3006 +/* $NetBSD: node.h,v 1.1.1.4 2008/09/02 07:50:47 christos Exp $ */
3007 +
3008 /* node.h -- declarations for Node.
3009 - $Id: node.h,v 1.2 2004/04/11 17:56:47 karl Exp $
3010 + Id: node.h,v 1.2 2004/04/11 17:56:47 karl Exp
3012 Copyright (C) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
3014 diff -rNU3 texinfo.orig/makeinfo/sectioning.c texinfo/makeinfo/sectioning.c
3015 --- texinfo.orig/makeinfo/sectioning.c 2004-07-06 00:23:23.000000000 +0200
3016 +++ texinfo/makeinfo/sectioning.c 2015-10-18 11:13:23.000000000 +0200
3017 @@ -1,5 +1,7 @@
3018 +/* $NetBSD: sectioning.c,v 1.2 2011/05/11 23:20:46 joerg Exp $ */
3019 +
3020 /* sectioning.c -- for @chapter, @section, ..., @contents ...
3021 - $Id: sectioning.c,v 1.25 2004/07/05 22:23:23 karl Exp $
3022 + Id: sectioning.c,v 1.25 2004/07/05 22:23:23 karl Exp
3024 Copyright (C) 1999, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
3026 @@ -256,14 +258,13 @@
3027 return xstrdup ("");
3028 else if (enum_marker == APPENDIX_MAGIC)
3029 {
3030 - char s[1];
3031 - sprintf (s, "%c", numbers[0] + 64);
3032 + char s[2] = { numbers[0] + 64, '\0' };
3033 return xstrdup (s);
3034 }
3035 else
3036 {
3037 - char s[5];
3038 - sprintf (s, "%d", numbers[0]);
3039 + char s[11];
3040 + snprintf (s, sizeof(s), "%d", numbers[0]);
3041 return xstrdup (s);
3042 }
3043 }
3044 diff -rNU3 texinfo.orig/makeinfo/sectioning.h texinfo/makeinfo/sectioning.h
3045 --- texinfo.orig/makeinfo/sectioning.h 2004-04-11 19:56:47.000000000 +0200
3046 +++ texinfo/makeinfo/sectioning.h 2015-10-18 11:13:23.000000000 +0200
3047 @@ -1,5 +1,7 @@
3048 +/* $NetBSD: sectioning.h,v 1.1.1.4 2008/09/02 07:50:47 christos Exp $ */
3049 +
3050 /* sectioning.h -- all related stuff @chapter, @section... @contents
3051 - $Id: sectioning.h,v 1.5 2004/04/11 17:56:47 karl Exp $
3052 + Id: sectioning.h,v 1.5 2004/04/11 17:56:47 karl Exp
3054 Copyright (C) 1999, 2003 Free Software Foundation, Inc.
3056 diff -rNU3 texinfo.orig/makeinfo/tests/Makefile.am texinfo/makeinfo/tests/Makefile.am
3057 --- texinfo.orig/makeinfo/tests/Makefile.am 2004-04-11 19:56:47.000000000 +0200
3058 +++ texinfo/makeinfo/tests/Makefile.am 2015-10-18 11:13:23.000000000 +0200
3059 @@ -1,4 +1,4 @@
3060 -# $Id: Makefile.am,v 1.5 2004/04/11 17:56:47 karl Exp $
3061 +# Id: Makefile.am,v 1.5 2004/04/11 17:56:47 karl Exp
3062 # Makefile.am for texinfo/tests/makeinfo.
3063 #
3064 # This file is free software; as a special exception the author gives
3065 diff -rNU3 texinfo.orig/makeinfo/tests/Makefile.in texinfo/makeinfo/tests/Makefile.in
3066 --- texinfo.orig/makeinfo/tests/Makefile.in 2004-12-31 19:01:48.000000000 +0100
3067 +++ texinfo/makeinfo/tests/Makefile.in 2015-10-18 11:13:23.000000000 +0200
3068 @@ -14,7 +14,7 @@
3070 @SET_MAKE@
3072 -# $Id: Makefile.am,v 1.5 2004/04/11 17:56:47 karl Exp $
3073 +# Id: Makefile.am,v 1.5 2004/04/11 17:56:47 karl Exp
3074 # Makefile.am for texinfo/tests/makeinfo.
3075 #
3076 # This file is free software; as a special exception the author gives
3077 diff -rNU3 texinfo.orig/makeinfo/tests/copying texinfo/makeinfo/tests/copying
3078 --- texinfo.orig/makeinfo/tests/copying 2004-04-20 15:26:00.000000000 +0200
3079 +++ texinfo/makeinfo/tests/copying 2015-10-18 11:13:23.000000000 +0200
3080 @@ -1,5 +1,5 @@
3081 #!/bin/sh
3082 -# $Id: copying,v 1.2 2004/04/20 13:26:00 karl Exp $
3083 +# Id: copying,v 1.2 2004/04/20 13:26:00 karl Exp
3084 # Test @copying. The configure script for tramp uses this to make sure
3085 # the makeinfo that is present supports @copying.
3087 diff -rNU3 texinfo.orig/makeinfo/tests/html-manuals texinfo/makeinfo/tests/html-manuals
3088 --- texinfo.orig/makeinfo/tests/html-manuals 2004-04-11 19:56:47.000000000 +0200
3089 +++ texinfo/makeinfo/tests/html-manuals 2015-10-18 11:13:23.000000000 +0200
3090 @@ -1,5 +1,5 @@
3091 #!/bin/sh
3092 -# $Id: html-manuals,v 1.3 2004/04/11 17:56:47 karl Exp $
3093 +# Id: html-manuals,v 1.3 2004/04/11 17:56:47 karl Exp
3094 # Test that all the distribution manuals can be converted to HTML.
3096 : ${srcdir=.}
3097 diff -rNU3 texinfo.orig/makeinfo/tests/include-value texinfo/makeinfo/tests/include-value
3098 --- texinfo.orig/makeinfo/tests/include-value 2004-04-11 19:56:47.000000000 +0200
3099 +++ texinfo/makeinfo/tests/include-value 2015-10-18 11:13:23.000000000 +0200
3100 @@ -1,5 +1,5 @@
3101 #!/bin/sh
3102 -# $Id: include-value,v 1.3 2004/04/11 17:56:47 karl Exp $
3103 +# Id: include-value,v 1.3 2004/04/11 17:56:47 karl Exp
3104 # Test @value expansion in @include and @verbatiminclude names.
3106 unset TEXINFO_OUTPUT
3107 diff -rNU3 texinfo.orig/makeinfo/tests/include-value.txi texinfo/makeinfo/tests/include-value.txi
3108 --- texinfo.orig/makeinfo/tests/include-value.txi 2004-04-11 19:56:47.000000000 +0200
3109 +++ texinfo/makeinfo/tests/include-value.txi 2015-10-18 11:13:23.000000000 +0200
3110 @@ -1,6 +1,6 @@
3111 \input texinfo
3112 @setfilename include-value.info
3113 -@c $Id: include-value.txi,v 1.2 2004/04/11 17:56:47 karl Exp $
3114 +@c Id: include-value.txi,v 1.2 2004/04/11 17:56:47 karl Exp
3116 @set testvar incl-incl.txi
3118 diff -rNU3 texinfo.orig/makeinfo/tests/twofiles texinfo/makeinfo/tests/twofiles
3119 --- texinfo.orig/makeinfo/tests/twofiles 2004-04-11 19:56:47.000000000 +0200
3120 +++ texinfo/makeinfo/tests/twofiles 2015-10-18 11:13:23.000000000 +0200
3121 @@ -1,5 +1,5 @@
3122 #!/bin/sh
3123 -# $Id: twofiles,v 1.3 2004/04/11 17:56:47 karl Exp $
3124 +# Id: twofiles,v 1.3 2004/04/11 17:56:47 karl Exp
3125 # Test that an existing and nonexisting file doesn't cause a
3126 # segmentation fault.
3127 # From: Arkadiusz Miskiewicz <misiek@pld.ORG.PL>, 15 Feb 2003 13:22:49 +0100.
3128 diff -rNU3 texinfo.orig/makeinfo/toc.c texinfo/makeinfo/toc.c
3129 --- texinfo.orig/makeinfo/toc.c 2004-04-11 19:56:47.000000000 +0200
3130 +++ texinfo/makeinfo/toc.c 2015-10-18 11:13:23.000000000 +0200
3131 @@ -1,5 +1,7 @@
3132 +/* $NetBSD: toc.c,v 1.1.1.4 2008/09/02 07:50:47 christos Exp $ */
3133 +
3134 /* toc.c -- table of contents handling.
3135 - $Id: toc.c,v 1.6 2004/04/11 17:56:47 karl Exp $
3136 + Id: toc.c,v 1.6 2004/04/11 17:56:47 karl Exp
3138 Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
3140 diff -rNU3 texinfo.orig/makeinfo/toc.h texinfo/makeinfo/toc.h
3141 --- texinfo.orig/makeinfo/toc.h 2004-04-11 19:56:47.000000000 +0200
3142 +++ texinfo/makeinfo/toc.h 2015-10-18 11:13:23.000000000 +0200
3143 @@ -1,5 +1,7 @@
3144 +/* $NetBSD: toc.h,v 1.1.1.4 2008/09/02 07:50:47 christos Exp $ */
3145 +
3146 /* toc.h -- table of contents handling.
3147 - $Id: toc.h,v 1.2 2004/04/11 17:56:47 karl Exp $
3148 + Id: toc.h,v 1.2 2004/04/11 17:56:47 karl Exp
3150 Copyright (C) 1999 Free Software Foundation, Inc.
3152 diff -rNU3 texinfo.orig/makeinfo/xml.c texinfo/makeinfo/xml.c
3153 --- texinfo.orig/makeinfo/xml.c 2004-12-19 18:02:23.000000000 +0100
3154 +++ texinfo/makeinfo/xml.c 2015-10-18 11:13:23.000000000 +0200
3155 @@ -1,5 +1,7 @@
3156 +/* $NetBSD: xml.c,v 1.2 2014/11/15 02:01:27 joerg Exp $ */
3157 +
3158 /* xml.c -- xml output.
3159 - $Id: xml.c,v 1.52 2004/12/19 17:02:23 karl Exp $
3160 + Id: xml.c,v 1.52 2004/12/19 17:02:23 karl Exp
3162 Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
3164 @@ -868,7 +870,7 @@
3165 return;
3166 }
3168 - if (!xml_element_list[elt].name || !strlen (xml_element_list[elt].name))
3169 + if (!strlen (xml_element_list[elt].name))
3170 {
3171 /*printf ("Warning: Inserting empty element %d\n", elt);*/
3172 return;
3173 diff -rNU3 texinfo.orig/makeinfo/xml.h texinfo/makeinfo/xml.h
3174 --- texinfo.orig/makeinfo/xml.h 2004-11-26 01:48:35.000000000 +0100
3175 +++ texinfo/makeinfo/xml.h 2015-10-18 11:13:23.000000000 +0200
3176 @@ -1,5 +1,7 @@
3177 +/* $NetBSD: xml.h,v 1.1.1.3 2008/09/02 07:50:51 christos Exp $ */
3178 +
3179 /* xml.h -- xml output declarations.
3180 - $Id: xml.h,v 1.24 2004/11/26 00:48:35 karl Exp $
3181 + Id: xml.h,v 1.24 2004/11/26 00:48:35 karl Exp
3183 Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
3185 diff -rNU3 texinfo.orig/makeinfo/xref.c texinfo/makeinfo/xref.c
3186 --- texinfo.orig/makeinfo/xref.c 2004-12-21 18:28:35.000000000 +0100
3187 +++ texinfo/makeinfo/xref.c 2015-10-18 11:13:23.000000000 +0200
3188 @@ -1,5 +1,7 @@
3189 +/* $NetBSD: xref.c,v 1.1.1.2 2008/09/02 07:50:51 christos Exp $ */
3190 +
3191 /* xref.c -- cross references for Texinfo.
3192 - $Id: xref.c,v 1.4 2004/12/21 17:28:35 karl Exp $
3193 + Id: xref.c,v 1.4 2004/12/21 17:28:35 karl Exp
3195 Copyright (C) 2004 Free Software Foundation, Inc.
3197 diff -rNU3 texinfo.orig/makeinfo/xref.h texinfo/makeinfo/xref.h
3198 --- texinfo.orig/makeinfo/xref.h 2004-04-11 19:56:47.000000000 +0200
3199 +++ texinfo/makeinfo/xref.h 2015-10-18 11:13:23.000000000 +0200
3200 @@ -1,5 +1,7 @@
3201 +/* $NetBSD: xref.h,v 1.1.1.2 2008/09/02 07:50:51 christos Exp $ */
3202 +
3203 /* xref.h -- declarations for the cross references.
3204 - $Id: xref.h,v 1.1 2004/04/11 17:56:47 karl Exp $
3205 + Id: xref.h,v 1.1 2004/04/11 17:56:47 karl Exp
3207 Copyright (C) 2004 Free Software Foundation, Inc.
3209 diff -rNU3 texinfo.orig/po/Makefile.in.in texinfo/po/Makefile.in.in
3210 --- texinfo.orig/po/Makefile.in.in 2004-04-11 19:56:47.000000000 +0200
3211 +++ texinfo/po/Makefile.in.in 2015-10-18 11:13:23.000000000 +0200
3212 @@ -13,7 +13,7 @@
3213 PACKAGE = @PACKAGE@
3214 VERSION = @VERSION@
3216 -SHELL = /bin/sh
3217 +SHELL = @SHELL@
3218 @SET_MAKE@
3220 srcdir = @srcdir@
3221 diff -rNU3 texinfo.orig/texinfo2netbsd texinfo/texinfo2netbsd
3222 --- texinfo.orig/texinfo2netbsd 1970-01-01 01:00:00.000000000 +0100
3223 +++ texinfo/texinfo2netbsd 2015-10-18 11:13:23.000000000 +0200
3224 @@ -0,0 +1,86 @@
3225 +#! /bin/sh
3226 +#
3227 +# $NetBSD: texinfo2netbsd,v 1.4 2008/04/30 13:10:50 martin Exp $
3228 +#
3229 +# Copyright (c) 2003, 2004 The NetBSD Foundation, Inc.
3230 +# All rights reserved.
3231 +#
3232 +# Redistribution and use in source and binary forms, with or without
3233 +# modification, are permitted provided that the following conditions
3234 +# are met:
3235 +# 1. Redistributions of source code must retain the above copyright
3236 +# notice, this list of conditions and the following disclaimer.
3237 +# 2. Redistributions in binary form must reproduce the above copyright
3238 +# notice, this list of conditions and the following disclaimer in the
3239 +# documentation and/or other materials provided with the distribution.
3240 +#
3241 +# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
3242 +# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
3243 +# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
3244 +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
3245 +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
3246 +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
3247 +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
3248 +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
3249 +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
3250 +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
3251 +# POSSIBILITY OF SUCH DAMAGE.
3252 +#
3253 +# texinfo2netbsd: convert an texinfo source tree into a
3254 +# format suitable for commit. Works on current dir.
3255 +#
3256 +
3257 +# delete some superfluous files
3258 +echo deleting some superfluous files
3259 +rm -rf djgpp
3260 +
3261 +echo done
3262 +
3263 +### Remove the $'s around RCS tags
3264 +find . -type f -print | xargs egrep -l '\$(Id|Created|Header|NetBSD|Revision)' | while read f; do
3265 + sed -e 's/\$\(Id.*\) \$/\1/' \
3266 + -e 's/\$\(Created.*\) \$/\1/' \
3267 + -e 's/\$\(Header.*\) \$/\1/' \
3268 + -e 's/\$\(NetBSD.*\) \$/\1/' \
3269 + -e 's/\$\(Revision.*\) \$/\1/' \
3270 + $f > /tmp/texinfo2$$ && mv /tmp/texinfo2$$ $f && \
3271 + echo removed RCS tag from $f
3272 +done
3273 +
3274 +### Add our NetBSD RCS Id
3275 +find . -type f -name '*.[chly]' -print | while read c; do
3276 + sed 1q < $c | grep -q '\$NetBSD' || (
3277 +echo "/* \$NetBSD\$ */" >/tmp/texinfo3$$
3278 +echo "" >>/tmp/texinfo3$$
3279 +cat $c >> /tmp/texinfo3$$
3280 +mv /tmp/texinfo3$$ $c && echo added NetBSD RCS tag to $c
3281 + )
3282 +done
3283 +
3284 +find . -type f -name '*.[0-9]' -print | while read m; do
3285 + sed 1q < $m | grep -q '\$NetBSD' || (
3286 +echo ".\\\" \$NetBSD\$" >/tmp/texinfo4$$
3287 +echo ".\\\"" >>/tmp/texinfo4$$
3288 +cat $m >> /tmp/texinfo4$$
3289 +mv /tmp/texinfo4$$ $m && echo added NetBSD RCS tag to $m
3290 + )
3291 +done
3292 +
3293 +find . -type f -name '*.texi' -print | while read t; do
3294 + sed "2 s/^/@c \$NetBSD\$\\
3295 +/" < $t > /tmp/texinfo5$$
3296 + mv /tmp/texinfo5$$ $t && echo added NetBSD RCS tag to $t
3297 +done
3298 +
3299 +echo done
3300 +
3301 +echo You can import now.
3302 +
3303 +echo Path: src/gnu/dist/texinfo
3304 +echo Vendor: FSF
3305 +echo Versiontag: texinfo-X-Y
3306 +
3307 +echo
3308 +echo Do not forget to update src/gnu/usr.bin/texinfo/common/config.h
3309 +echo and src/gnu/dist/texinfo/util/texinfo.cat!
3310 +exit 0
3311 diff -rNU3 texinfo.orig/util/Makefile.am texinfo/util/Makefile.am
3312 --- texinfo.orig/util/Makefile.am 2004-08-26 13:43:18.000000000 +0200
3313 +++ texinfo/util/Makefile.am 2015-10-18 11:13:23.000000000 +0200
3314 @@ -1,4 +1,4 @@
3315 -# $Id: Makefile.am,v 1.14 2004/08/26 11:43:18 karl Exp $
3316 +# Id: Makefile.am,v 1.14 2004/08/26 11:43:18 karl Exp
3317 # Makefile.am for texinfo/util.
3318 # Run automake in .. to produce Makefile.in from this.
3319 #
3320 diff -rNU3 texinfo.orig/util/Makefile.in texinfo/util/Makefile.in
3321 --- texinfo.orig/util/Makefile.in 2004-12-31 19:01:49.000000000 +0100
3322 +++ texinfo/util/Makefile.in 2015-10-18 11:13:23.000000000 +0200
3323 @@ -14,7 +14,7 @@
3325 @SET_MAKE@
3327 -# $Id: Makefile.am,v 1.14 2004/08/26 11:43:18 karl Exp $
3328 +# Id: Makefile.am,v 1.14 2004/08/26 11:43:18 karl Exp
3329 # Makefile.am for texinfo/util.
3330 # Run automake in .. to produce Makefile.in from this.
3331 #
3332 diff -rNU3 texinfo.orig/util/README texinfo/util/README
3333 --- texinfo.orig/util/README 2004-04-11 19:56:47.000000000 +0200
3334 +++ texinfo/util/README 2015-10-18 11:13:23.000000000 +0200
3335 @@ -1,4 +1,4 @@
3336 -$Id: README,v 1.5 2004/04/11 17:56:47 karl Exp $
3337 +Id: README,v 1.5 2004/04/11 17:56:47 karl Exp
3338 texinfo/util/README
3340 Copyright (C) 2002 Free Software Foundation, Inc.
3341 diff -rNU3 texinfo.orig/util/deref.c texinfo/util/deref.c
3342 --- texinfo.orig/util/deref.c 2002-08-26 01:38:39.000000000 +0200
3343 +++ texinfo/util/deref.c 2015-10-18 11:13:23.000000000 +0200
3344 @@ -1,3 +1,5 @@
3345 +/* $NetBSD: deref.c,v 1.1.1.3 2003/01/17 14:54:37 wiz Exp $ */
3346 +
3347 /*
3348 * deref.c
3349 *
3350 diff -rNU3 texinfo.orig/util/dir-example texinfo/util/dir-example
3351 --- texinfo.orig/util/dir-example 2004-12-30 14:42:54.000000000 +0100
3352 +++ texinfo/util/dir-example 2015-10-18 11:13:23.000000000 +0200
3353 @@ -10,7 +10,7 @@
3354 If you have dir entries for Texinfo manuals you'd like to be added here,
3355 please send them to karl@gnu.org.
3357 -$Id: dir-example,v 1.51 2004/12/18 02:11:43 karl Exp $
3358 +Id: dir-example,v 1.51 2004/12/18 02:11:43 karl Exp
3359 \x1f
3360 File: dir, Node: Top, This is the top of the INFO tree.
3362 diff -rNU3 texinfo.orig/util/gen-dir-node texinfo/util/gen-dir-node
3363 --- texinfo.orig/util/gen-dir-node 2004-04-11 19:56:47.000000000 +0200
3364 +++ texinfo/util/gen-dir-node 2015-10-18 11:13:23.000000000 +0200
3365 @@ -1,5 +1,5 @@
3366 #!/bin/sh
3367 -# $Id: gen-dir-node,v 1.3 2004/04/11 17:56:47 karl Exp $
3368 +# Id: gen-dir-node,v 1.3 2004/04/11 17:56:47 karl Exp
3369 # Generate the top-level Info node, given a directory of Info files
3370 # and (optionally) a skeleton file. The output will be suitable for a
3371 # top-level dir file. The skeleton file contains info topic names in the
3372 @@ -51,7 +51,7 @@
3373 echo "by `whoami`@`hostname` for `(cd ${INFODIR}; pwd)`"
3375 cat << moobler
3376 -\$Id: gen-dir-node,v 1.3 2004/04/11 17:56:47 karl Exp $
3377 +\Id: gen-dir-node,v 1.3 2004/04/11 17:56:47 karl Exp
3378 This is the file .../info/dir, which contains the topmost node of the
3379 Info hierarchy. The first time you invoke Info you start off
3380 looking at that node, which is (dir)Top.
3381 diff -rNU3 texinfo.orig/util/gendocs.sh texinfo/util/gendocs.sh
3382 --- texinfo.orig/util/gendocs.sh 2004-09-01 13:40:20.000000000 +0200
3383 +++ texinfo/util/gendocs.sh 2015-10-18 11:13:23.000000000 +0200
3384 @@ -1,7 +1,7 @@
3385 #!/bin/sh
3386 # gendocs.sh -- generate a GNU manual in many formats. This script is
3387 # mentioned in maintain.texi. See the help message below for usage details.
3388 -# $Id: gendocs.sh,v 1.13 2004/09/01 11:40:20 karl Exp $
3389 +# Id: gendocs.sh,v 1.13 2004/09/01 11:40:20 karl Exp
3390 #
3391 # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
3392 #
3393 @@ -39,7 +39,7 @@
3394 : ${GENDOCS_TEMPLATE_DIR="."}
3395 unset CDPATH
3397 -rcs_revision='$Revision: 1.13 $'
3398 +rcs_revision='Revision: 1.13'
3399 rcs_version=`set - $rcs_revision; echo $2`
3400 program=`echo $0 | sed -e 's!.*/!!'`
3401 version="gendocs.sh $rcs_version
3402 diff -rNU3 texinfo.orig/util/gendocs_template texinfo/util/gendocs_template
3403 --- texinfo.orig/util/gendocs_template 2004-09-23 15:16:19.000000000 +0200
3404 +++ texinfo/util/gendocs_template 2015-10-18 11:13:23.000000000 +0200
3405 @@ -1,7 +1,7 @@
3406 <?xml version="1.0" encoding="utf-8" ?>
3407 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
3408 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3409 -<!-- $Id: gendocs_template,v 1.6 2004/09/23 13:16:19 karl Exp $ -->
3410 +<!-- Id: gendocs_template,v 1.6 2004/09/23 13:16:19 karl Exp -->
3411 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
3413 <head>
3414 @@ -91,7 +91,7 @@
3415 <p>
3416 Updated:
3417 <!-- timestamp start -->
3418 -$Date: 2004/09/23 13:16:19 $ $Author: karl $
3419 +$Date: 2008/09/02 07:50:57 $ $Author: christos $
3420 <!-- timestamp end -->
3421 </p>
3422 </div>
3423 diff -rNU3 texinfo.orig/util/infosrch texinfo/util/infosrch
3424 --- texinfo.orig/util/infosrch 2004-04-11 19:56:47.000000000 +0200
3425 +++ texinfo/util/infosrch 2015-10-18 11:13:23.000000000 +0200
3426 @@ -1,5 +1,5 @@
3427 #!/usr/local/bin/perl -w
3428 -# $Id: infosrch,v 1.2 2004/04/11 17:56:47 karl Exp $
3429 +# Id: infosrch,v 1.2 2004/04/11 17:56:47 karl Exp
3430 # infosrch does a regex search on an info manual.
3431 # By Harry Putnam <reader@newsguy.com>.
3433 diff -rNU3 texinfo.orig/util/install-info-html texinfo/util/install-info-html
3434 --- texinfo.orig/util/install-info-html 2004-04-11 19:56:47.000000000 +0200
3435 +++ texinfo/util/install-info-html 2015-10-18 11:13:23.000000000 +0200
3436 @@ -1,5 +1,5 @@
3437 #!@BASH@
3438 -# $Id: install-info-html,v 1.3 2004/04/11 17:56:47 karl Exp $
3439 +# Id: install-info-html,v 1.3 2004/04/11 17:56:47 karl Exp
3441 name=install-info-html
3442 version=1.0
3443 diff -rNU3 texinfo.orig/util/install-info.c texinfo/util/install-info.c
3444 --- texinfo.orig/util/install-info.c 2004-04-11 19:56:47.000000000 +0200
3445 +++ texinfo/util/install-info.c 2015-10-18 11:13:23.000000000 +0200
3446 @@ -1,5 +1,7 @@
3447 +/* $NetBSD: install-info.c,v 1.9 2008/09/02 08:00:24 christos Exp $ */
3448 +
3449 /* install-info -- create Info directory entry(ies) for an Info file.
3450 - $Id: install-info.c,v 1.12 2004/04/11 17:56:47 karl Exp $
3451 + Id: install-info.c,v 1.12 2004/04/11 17:56:47 karl Exp
3453 Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
3454 Foundation, Inc.
3455 diff -rNU3 texinfo.orig/util/texi-docstring-magic.el texinfo/util/texi-docstring-magic.el
3456 --- texinfo.orig/util/texi-docstring-magic.el 2004-04-11 19:56:47.000000000 +0200
3457 +++ texinfo/util/texi-docstring-magic.el 2015-10-18 11:13:23.000000000 +0200
3458 @@ -5,7 +5,7 @@
3459 ;; Copyright (C) 1998 David Aspinall
3460 ;; Maintainer: David Aspinall <da@dcs.ed.ac.uk>
3461 ;;
3462 -;; $Id: texi-docstring-magic.el,v 1.2 2004/04/11 17:56:47 karl Exp $
3463 +;; Id: texi-docstring-magic.el,v 1.2 2004/04/11 17:56:47 karl Exp
3464 ;;
3465 ;; This package is distributed under the terms of the
3466 ;; GNU General Public License, Version 2.
3467 diff -rNU3 texinfo.orig/util/texi2dvi texinfo/util/texi2dvi
3468 --- texinfo.orig/util/texi2dvi 2004-12-31 19:03:05.000000000 +0100
3469 +++ texinfo/util/texi2dvi 2015-10-18 11:13:23.000000000 +0200
3470 @@ -1,6 +1,6 @@
3471 #! /bin/sh
3472 # texi2dvi --- produce DVI (or PDF) files from Texinfo (or LaTeX) sources.
3473 -# $Id: texi2dvi,v 1.34 2004/12/01 18:35:36 karl Exp $
3474 +# Id: texi2dvi,v 1.34 2004/12/01 18:35:36 karl Exp
3475 #
3476 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001,
3477 # 2002, 2003, 2004 Free Software Foundation, Inc.
3478 @@ -27,7 +27,7 @@
3479 # the `--debug' option when making a bug report.
3481 # This string is expanded by rcs automatically when this file is checked out.
3482 -rcs_revision='$Revision: 1.34 $'
3483 +rcs_revision='Revision: 1.34'
3484 rcs_version=`set - $rcs_revision; echo $2`
3485 program=`echo $0 | sed -e 's!.*/!!'`
3486 version="texi2dvi (GNU Texinfo 4.8) $rcs_version
3487 @@ -605,10 +605,10 @@
3488 # If this is a Texinfo file with a specified input encoding, and
3489 # recode is available, then recode to plain 7 bit Texinfo.
3490 if test $language = texinfo; then
3491 - pgm='s/\(^\|.* \)@documentencoding *\([^ ][^ ]*\)\( .*\|$\)/\2/
3492 - t found
3493 - d
3494 - :found
3495 + pgm='s/\(^\|.* \)@documentencoding *\([^ ][^ ]*\)\( .*\|$\)/\2/
3496 + t found
3497 + d
3498 + :found
3499 q'
3500 encoding=`sed -e "$pgm" "$filename_input"`
3501 if $recode && test -n "$encoding" && findprog recode; then
3502 @@ -691,8 +691,13 @@
3504 # Finally, run TeX.
3505 cmd="$tex $tex_args"
3506 - $verbose "Running $cmd $filename_input ..."
3507 + $verbose "Running $cmd ..."
3508 if $cmd "$filename_input" >&5; then :; else
3509 + echo "$0: TeX failed. If the above said 'tex: not found', " >&2
3510 + echo "$0: you may need to install TeX;" >&2
3511 + echo "$0: it is available from the pkgsrc system in print/teTeX." >&2
3512 + echo "$0: If TeX is installed, make sure it is in your $PATH, or" >&2
3513 + echo "$0: set the environment variable $TEX to its location." >&2
3514 echo "$0: $tex exited with bad status, quitting." >&2
3515 echo "$0: see $filename_noext.log for errors." >&2
3516 test "$clean" = t \
3517 diff -rNU3 texinfo.orig/util/texi2pdf texinfo/util/texi2pdf
3518 --- texinfo.orig/util/texi2pdf 2004-07-11 03:02:35.000000000 +0200
3519 +++ texinfo/util/texi2pdf 2015-10-18 11:13:23.000000000 +0200
3520 @@ -1,5 +1,5 @@
3521 #!/bin/sh
3522 -# $Id: texi2pdf,v 1.1 2004/07/11 01:02:35 karl Exp $
3523 +# Id: texi2pdf,v 1.1 2004/07/11 01:02:35 karl Exp
3524 # Written by Thomas Esser. Public domain.
3525 # Execute texi2dvi --pdf.
3527 diff -rNU3 texinfo.orig/util/texindex.c texinfo/util/texindex.c
3528 --- texinfo.orig/util/texindex.c 2004-04-11 19:56:47.000000000 +0200
3529 +++ texinfo/util/texindex.c 2015-10-18 11:13:23.000000000 +0200
3530 @@ -1,5 +1,7 @@
3531 +/* $NetBSD: texindex.c,v 1.11 2008/09/02 08:00:24 christos Exp $ */
3532 +
3533 /* texindex -- sort TeX index dribble output into an actual index.
3534 - $Id: texindex.c,v 1.11 2004/04/11 17:56:47 karl Exp $
3535 + Id: texindex.c,v 1.11 2004/04/11 17:56:47 karl Exp
3537 Copyright (C) 1987, 1991, 1992, 1996, 1997, 1998, 1999, 2000, 2001,
3538 2002, 2003, 2004 Free Software Foundation, Inc.
3539 @@ -37,16 +39,12 @@
3540 #define memset(ptr, ignore, count) bzero (ptr, count)
3541 #endif
3543 -char *mktemp (char *);
3544 -
3545 #if !defined (SEEK_SET)
3546 # define SEEK_SET 0
3547 # define SEEK_CUR 1
3548 # define SEEK_END 2
3549 #endif /* !SEEK_SET */
3551 -struct linebuffer;
3552 -
3553 /* When sorting in core, this structure describes one line
3554 and the position and length of its first keyfield. */
3555 struct lineinfo
3556 @@ -96,16 +94,6 @@
3557 /* The allocated length of `linearray'. */
3558 long nlines;
3560 -/* Directory to use for temporary files. On Unix, it ends with a slash. */
3561 -char *tempdir;
3562 -
3563 -/* Number of last temporary file. */
3564 -int tempcount;
3565 -
3566 -/* Number of last temporary file already deleted.
3567 - Temporary files are deleted by `flush_tempfiles' in order of creation. */
3568 -int last_deleted_tempcount;
3569 -
3570 /* During in-core sort, this points to the base of the data block
3571 which contains all the lines of data. */
3572 char *text_base;
3573 @@ -117,15 +105,9 @@
3574 determine whether we need initials in the sorted form. */
3575 char first_initial;
3577 -/* Additional command switches .*/
3578 -
3579 -/* Nonzero means do not delete tempfiles -- for debugging. */
3580 -int keep_tempfiles;
3581 -
3582 /* Forward declarations of functions in this file. */
3583 void decode_command (int argc, char **argv);
3584 void sort_in_core (char *infile, int total, char *outfile);
3585 -void sort_offline (char *infile, off_t total, char *outfile);
3586 char **parsefile (char *filename, char **nextline, char *data, long int size);
3587 char *find_field (struct keyfield *keyfield, char *str, long int *lengthptr);
3588 char *find_pos (char *str, int words, int chars, int ignore_blanks);
3589 @@ -137,26 +119,17 @@
3590 long int length1, long int pos1, char *start2,
3591 long int length2, long int pos2);
3592 int compare_full (const void *, const void *);
3593 -long readline (struct linebuffer *linebuffer, FILE *stream);
3594 -int merge_files (char **infiles, int nfiles, char *outfile);
3595 -int merge_direct (char **infiles, int nfiles, char *outfile);
3596 void pfatal_with_name (const char *name);
3597 void fatal (const char *format, const char *arg);
3598 void error (const char *format, const char *arg);
3599 void *xmalloc (), *xrealloc ();
3600 -char *concat (char *s1, char *s2);
3601 -void flush_tempfiles (int to_count);
3602 +static char *concat3 (const char *, const char *, const char *);
3603 \f
3604 -#define MAX_IN_CORE_SORT 500000
3605 -
3606 int
3607 main (int argc, char **argv)
3608 {
3609 int i;
3611 - tempcount = 0;
3612 - last_deleted_tempcount = 0;
3613 -
3614 #ifdef HAVE_SETLOCALE
3615 /* Set locale via LC_ALL. */
3616 setlocale (LC_ALL, "");
3617 @@ -220,19 +193,20 @@
3619 outfile = outfiles[i];
3620 if (!outfile)
3621 - outfile = concat (infiles[i], "s");
3622 + outfile = concat3 (infiles[i], "s", "");
3624 need_initials = 0;
3625 first_initial = '\0';
3627 - if (ptr < MAX_IN_CORE_SORT)
3628 - /* Sort a small amount of data. */
3629 - sort_in_core (infiles[i], (int)ptr, outfile);
3630 - else
3631 - sort_offline (infiles[i], ptr, outfile);
3632 + if (ptr != (int)ptr)
3633 + {
3634 + fprintf (stderr, "%s: %s: file too large\n", program_name,
3635 + infiles[i]);
3636 + xexit (1);
3637 + }
3638 + sort_in_core (infiles[i], (int)ptr, outfile);
3639 }
3641 - flush_tempfiles (tempcount);
3642 xexit (0);
3643 return 0; /* Avoid bogus warnings. */
3644 }
3645 @@ -250,10 +224,6 @@
3646 TEXINDEX_OPTION texindex_options[] = {
3647 { "--help", "-h", (int *)NULL, 0, (char *)NULL,
3648 N_("display this help and exit") },
3649 - { "--keep", "-k", &keep_tempfiles, 1, (char *)NULL,
3650 - N_("keep temporary files around after processing") },
3651 - { "--no-keep", 0, &keep_tempfiles, 0, (char *)NULL,
3652 - N_("do not keep temporary files around after processing (default)") },
3653 { "--output", "-o", (int *)NULL, 0, "FILE",
3654 N_("send output to FILE") },
3655 { "--version", (char *)NULL, (int *)NULL, 0, (char *)NULL,
3656 @@ -308,20 +278,6 @@
3657 char **ip;
3658 char **op;
3660 - /* Store default values into parameter variables. */
3661 -
3662 - tempdir = getenv ("TMPDIR");
3663 - if (tempdir == NULL)
3664 - tempdir = getenv ("TEMP");
3665 - if (tempdir == NULL)
3666 - tempdir = getenv ("TMP");
3667 - if (tempdir == NULL)
3668 - tempdir = DEFAULT_TMPDIR;
3669 - else
3670 - tempdir = concat (tempdir, "/");
3671 -
3672 - keep_tempfiles = 0;
3673 -
3674 /* Allocate ARGC input files, which must be enough. */
3676 infiles = (char **) xmalloc (argc * sizeof (char *));
3677 @@ -348,7 +304,7 @@
3678 else if ((strcmp (arg, "--keep") == 0) ||
3679 (strcmp (arg, "-k") == 0))
3680 {
3681 - keep_tempfiles = 1;
3682 + /* Ignore, for backward compatibility */
3683 }
3684 else if ((strcmp (arg, "--help") == 0) ||
3685 (strcmp (arg, "-h") == 0))
3686 @@ -384,41 +340,6 @@
3687 usage (1);
3688 }
3689 \f
3690 -/* Return a name for temporary file COUNT. */
3691 -
3692 -static char *
3693 -maketempname (int count)
3694 -{
3695 - static char *tempbase = NULL;
3696 - char tempsuffix[10];
3697 -
3698 - if (!tempbase)
3699 - {
3700 - int fd;
3701 - tempbase = concat (tempdir, "txidxXXXXXX");
3702 -
3703 - fd = mkstemp (tempbase);
3704 - if (fd == -1)
3705 - pfatal_with_name (tempbase);
3706 - }
3707 -
3708 - sprintf (tempsuffix, ".%d", count);
3709 - return concat (tempbase, tempsuffix);
3710 -}
3711 -
3712 -
3713 -/* Delete all temporary files up to TO_COUNT. */
3714 -
3715 -void
3716 -flush_tempfiles (int to_count)
3717 -{
3718 - if (keep_tempfiles)
3719 - return;
3720 - while (last_deleted_tempcount < to_count)
3721 - unlink (maketempname (++last_deleted_tempcount));
3722 -}
3723 -
3724 -\f
3725 /* Compare LINE1 and LINE2 according to the specified set of keyfields. */
3727 int
3728 @@ -801,150 +722,6 @@
3729 }
3730 }
3731 \f
3732 -/* A `struct linebuffer' is a structure which holds a line of text.
3733 - `readline' reads a line from a stream into a linebuffer
3734 - and works regardless of the length of the line. */
3735 -
3736 -struct linebuffer
3737 -{
3738 - long size;
3739 - char *buffer;
3740 -};
3741 -
3742 -/* Initialize LINEBUFFER for use. */
3743 -
3744 -void
3745 -initbuffer (struct linebuffer *linebuffer)
3746 -{
3747 - linebuffer->size = 200;
3748 - linebuffer->buffer = (char *) xmalloc (200);
3749 -}
3750 -
3751 -/* Read a line of text from STREAM into LINEBUFFER.
3752 - Return the length of the line. */
3753 -
3754 -long
3755 -readline (struct linebuffer *linebuffer, FILE *stream)
3756 -{
3757 - char *buffer = linebuffer->buffer;
3758 - char *p = linebuffer->buffer;
3759 - char *end = p + linebuffer->size;
3760 -
3761 - while (1)
3762 - {
3763 - int c = getc (stream);
3764 - if (p == end)
3765 - {
3766 - buffer = (char *) xrealloc (buffer, linebuffer->size *= 2);
3767 - p += buffer - linebuffer->buffer;
3768 - end += buffer - linebuffer->buffer;
3769 - linebuffer->buffer = buffer;
3770 - }
3771 - if (c < 0 || c == '\n')
3772 - {
3773 - *p = 0;
3774 - break;
3775 - }
3776 - *p++ = c;
3777 - }
3778 -
3779 - return p - buffer;
3780 -}
3781 -\f
3782 -/* Sort an input file too big to sort in core. */
3783 -
3784 -void
3785 -sort_offline (char *infile, off_t total, char *outfile)
3786 -{
3787 - /* More than enough. */
3788 - int ntemps = 2 * (total + MAX_IN_CORE_SORT - 1) / MAX_IN_CORE_SORT;
3789 - char **tempfiles = (char **) xmalloc (ntemps * sizeof (char *));
3790 - FILE *istream = fopen (infile, "r");
3791 - int i;
3792 - struct linebuffer lb;
3793 - long linelength;
3794 - int failure = 0;
3795 -
3796 - initbuffer (&lb);
3797 -
3798 - /* Read in one line of input data. */
3799 -
3800 - linelength = readline (&lb, istream);
3801 -
3802 - if (lb.buffer[0] != '\\' && lb.buffer[0] != '@')
3803 - {
3804 - error (_("%s: not a texinfo index file"), infile);
3805 - return;
3806 - }
3807 -
3808 - /* Split up the input into `ntemps' temporary files, or maybe fewer,
3809 - and put the new files' names into `tempfiles' */
3810 -
3811 - for (i = 0; i < ntemps; i++)
3812 - {
3813 - char *outname = maketempname (++tempcount);
3814 - FILE *ostream = fopen (outname, "w");
3815 - long tempsize = 0;
3816 -
3817 - if (!ostream)
3818 - pfatal_with_name (outname);
3819 - tempfiles[i] = outname;
3820 -
3821 - /* Copy lines into this temp file as long as it does not make file
3822 - "too big" or until there are no more lines. */
3823 -
3824 - while (tempsize + linelength + 1 <= MAX_IN_CORE_SORT)
3825 - {
3826 - tempsize += linelength + 1;
3827 - fputs (lb.buffer, ostream);
3828 - putc ('\n', ostream);
3829 -
3830 - /* Read another line of input data. */
3831 -
3832 - linelength = readline (&lb, istream);
3833 - if (!linelength && feof (istream))
3834 - break;
3835 -
3836 - if (lb.buffer[0] != '\\' && lb.buffer[0] != '@')
3837 - {
3838 - error (_("%s: not a texinfo index file"), infile);
3839 - failure = 1;
3840 - goto fail;
3841 - }
3842 - }
3843 - fclose (ostream);
3844 - if (feof (istream))
3845 - break;
3846 - }
3847 -
3848 - free (lb.buffer);
3849 -
3850 -fail:
3851 - /* Record number of temp files we actually needed. */
3852 -
3853 - ntemps = i;
3854 -
3855 - /* Sort each tempfile into another tempfile.
3856 - Delete the first set of tempfiles and put the names of the second
3857 - into `tempfiles'. */
3858 -
3859 - for (i = 0; i < ntemps; i++)
3860 - {
3861 - char *newtemp = maketempname (++tempcount);
3862 - sort_in_core (tempfiles[i], MAX_IN_CORE_SORT, newtemp);
3863 - if (!keep_tempfiles)
3864 - unlink (tempfiles[i]);
3865 - tempfiles[i] = newtemp;
3866 - }
3867 -
3868 - if (failure)
3869 - return;
3870 -
3871 - /* Merge the tempfiles together and indexify. */
3872 -
3873 - merge_files (tempfiles, ntemps, outfile);
3874 -}
3875 -\f
3876 /* Sort INFILE, whose size is TOTAL,
3877 assuming that is small enough to be done in-core,
3878 then indexify it and send the output to OUTFILE (or to stdout). */
3879 @@ -1348,8 +1125,7 @@
3881 for (next_line = linearray; next_line != stop_line; next_line++)
3882 {
3883 - /* If -u was specified, output the line only if distinct from
3884 - previous one. */
3885 + /* Output the line only if distinct from previous one. */
3886 if (next_line == linearray
3887 /* Compare previous line with this one, using only the
3888 explicitly specd keyfields. */
3889 @@ -1369,215 +1145,6 @@
3890 finish_index (ostream);
3891 }
3892 \f
3893 -/* Assume (and optionally verify) that each input file is sorted;
3894 - merge them and output the result.
3895 - Returns nonzero if any input file fails to be sorted.
3896 -
3897 - This is the high-level interface that can handle an unlimited
3898 - number of files. */
3899 -
3900 -#define MAX_DIRECT_MERGE 10
3901 -
3902 -int
3903 -merge_files (char **infiles, int nfiles, char *outfile)
3904 -{
3905 - char **tempfiles;
3906 - int ntemps;
3907 - int i;
3908 - int value = 0;
3909 - int start_tempcount = tempcount;
3910 -
3911 - if (nfiles <= MAX_DIRECT_MERGE)
3912 - return merge_direct (infiles, nfiles, outfile);
3913 -
3914 - /* Merge groups of MAX_DIRECT_MERGE input files at a time,
3915 - making a temporary file to hold each group's result. */
3916 -
3917 - ntemps = (nfiles + MAX_DIRECT_MERGE - 1) / MAX_DIRECT_MERGE;
3918 - tempfiles = (char **) xmalloc (ntemps * sizeof (char *));
3919 - for (i = 0; i < ntemps; i++)
3920 - {
3921 - int nf = MAX_DIRECT_MERGE;
3922 - if (i + 1 == ntemps)
3923 - nf = nfiles - i * MAX_DIRECT_MERGE;
3924 - tempfiles[i] = maketempname (++tempcount);
3925 - value |= merge_direct (&infiles[i * MAX_DIRECT_MERGE], nf, tempfiles[i]);
3926 - }
3927 -
3928 - /* All temporary files that existed before are no longer needed
3929 - since their contents have been merged into our new tempfiles.
3930 - So delete them. */
3931 - flush_tempfiles (start_tempcount);
3932 -
3933 - /* Now merge the temporary files we created. */
3934 -
3935 - merge_files (tempfiles, ntemps, outfile);
3936 -
3937 - free (tempfiles);
3938 -
3939 - return value;
3940 -}
3941 -\f
3942 -/* Assume (and optionally verify) that each input file is sorted;
3943 - merge them and output the result.
3944 - Returns nonzero if any input file fails to be sorted.
3945 -
3946 - This version of merging will not work if the number of
3947 - input files gets too high. Higher level functions
3948 - use it only with a bounded number of input files. */
3949 -
3950 -int
3951 -merge_direct (char **infiles, int nfiles, char *outfile)
3952 -{
3953 - struct linebuffer *lb1, *lb2;
3954 - struct linebuffer **thisline, **prevline;
3955 - FILE **streams;
3956 - int i;
3957 - int nleft;
3958 - int lossage = 0;
3959 - int *file_lossage;
3960 - struct linebuffer *prev_out = 0;
3961 - FILE *ostream = stdout;
3962 -
3963 - if (outfile)
3964 - {
3965 - ostream = fopen (outfile, "w");
3966 - }
3967 - if (!ostream)
3968 - pfatal_with_name (outfile);
3969 -
3970 - init_index ();
3971 -
3972 - if (nfiles == 0)
3973 - {
3974 - if (outfile)
3975 - fclose (ostream);
3976 - return 0;
3977 - }
3978 -
3979 - /* For each file, make two line buffers. Also, for each file, there
3980 - is an element of `thisline' which points at any time to one of the
3981 - file's two buffers, and an element of `prevline' which points to
3982 - the other buffer. `thisline' is supposed to point to the next
3983 - available line from the file, while `prevline' holds the last file
3984 - line used, which is remembered so that we can verify that the file
3985 - is properly sorted. */
3986 -
3987 - /* lb1 and lb2 contain one buffer each per file. */
3988 - lb1 = (struct linebuffer *) xmalloc (nfiles * sizeof (struct linebuffer));
3989 - lb2 = (struct linebuffer *) xmalloc (nfiles * sizeof (struct linebuffer));
3990 -
3991 - /* thisline[i] points to the linebuffer holding the next available
3992 - line in file i, or is zero if there are no lines left in that file. */
3993 - thisline = (struct linebuffer **)
3994 - xmalloc (nfiles * sizeof (struct linebuffer *));
3995 - /* prevline[i] points to the linebuffer holding the last used line
3996 - from file i. This is just for verifying that file i is properly
3997 - sorted. */
3998 - prevline = (struct linebuffer **)
3999 - xmalloc (nfiles * sizeof (struct linebuffer *));
4000 - /* streams[i] holds the input stream for file i. */
4001 - streams = (FILE **) xmalloc (nfiles * sizeof (FILE *));
4002 - /* file_lossage[i] is nonzero if we already know file i is not
4003 - properly sorted. */
4004 - file_lossage = (int *) xmalloc (nfiles * sizeof (int));
4005 -
4006 - /* Allocate and initialize all that storage. */
4007 -
4008 - for (i = 0; i < nfiles; i++)
4009 - {
4010 - initbuffer (&lb1[i]);
4011 - initbuffer (&lb2[i]);
4012 - thisline[i] = &lb1[i];
4013 - prevline[i] = &lb2[i];
4014 - file_lossage[i] = 0;
4015 - streams[i] = fopen (infiles[i], "r");
4016 - if (!streams[i])
4017 - pfatal_with_name (infiles[i]);
4018 -
4019 - readline (thisline[i], streams[i]);
4020 - }
4021 -
4022 - /* Keep count of number of files not at eof. */
4023 - nleft = nfiles;
4024 -
4025 - while (nleft)
4026 - {
4027 - struct linebuffer *best = 0;
4028 - struct linebuffer *exch;
4029 - int bestfile = -1;
4030 - int i;
4031 -
4032 - /* Look at the next avail line of each file; choose the least one. */
4033 -
4034 - for (i = 0; i < nfiles; i++)
4035 - {
4036 - if (thisline[i] &&
4037 - (!best ||
4038 - 0 < compare_general (best->buffer, thisline[i]->buffer,
4039 - (long) bestfile, (long) i, num_keyfields)))
4040 - {
4041 - best = thisline[i];
4042 - bestfile = i;
4043 - }
4044 - }
4045 -
4046 - /* Output that line, unless it matches the previous one and we
4047 - don't want duplicates. */
4048 -
4049 - if (!(prev_out &&
4050 - !compare_general (prev_out->buffer,
4051 - best->buffer, 0L, 1L, num_keyfields - 1)))
4052 - indexify (best->buffer, ostream);
4053 - prev_out = best;
4054 -
4055 - /* Now make the line the previous of its file, and fetch a new
4056 - line from that file. */
4057 -
4058 - exch = prevline[bestfile];
4059 - prevline[bestfile] = thisline[bestfile];
4060 - thisline[bestfile] = exch;
4061 -
4062 - while (1)
4063 - {
4064 - /* If the file has no more, mark it empty. */
4065 -
4066 - if (feof (streams[bestfile]))
4067 - {
4068 - thisline[bestfile] = 0;
4069 - /* Update the number of files still not empty. */
4070 - nleft--;
4071 - break;
4072 - }
4073 - readline (thisline[bestfile], streams[bestfile]);
4074 - if (thisline[bestfile]->buffer[0] || !feof (streams[bestfile]))
4075 - break;
4076 - }
4077 - }
4078 -
4079 - finish_index (ostream);
4080 -
4081 - /* Free all storage and close all input streams. */
4082 -
4083 - for (i = 0; i < nfiles; i++)
4084 - {
4085 - fclose (streams[i]);
4086 - free (lb1[i].buffer);
4087 - free (lb2[i].buffer);
4088 - }
4089 - free (file_lossage);
4090 - free (lb1);
4091 - free (lb2);
4092 - free (thisline);
4093 - free (prevline);
4094 - free (streams);
4095 -
4096 - if (outfile)
4097 - fclose (ostream);
4098 -
4099 - return lossage;
4100 -}
4101 -\f
4102 /* Print error message and exit. */
4104 void
4105 @@ -1612,17 +1179,18 @@
4106 }
4108 \f
4109 -/* Return a newly-allocated string concatenating S1 and S2. */
4110 +/* Return a newly-allocated string concatenating S1, S2, and S3. */
4112 -char *
4113 -concat (char *s1, char *s2)
4114 +static char *
4115 +concat3 (const char *s1, const char *s2, const char *s3)
4116 {
4117 - int len1 = strlen (s1), len2 = strlen (s2);
4118 - char *result = (char *) xmalloc (len1 + len2 + 1);
4119 + int len1 = strlen (s1), len2 = strlen (s2), len3 = strlen (s3);
4120 + char *result = (char *) xmalloc (len1 + len2 + len3 + 1);
4122 strcpy (result, s1);
4123 strcpy (result + len1, s2);
4124 - *(result + len1 + len2) = 0;
4125 + strcpy (result + len1 + len2, s3);
4126 + *(result + len1 + len2 + len3) = 0;
4128 return result;
4129 }
4130 diff -rNU3 texinfo.orig/util/texinfo.dtd texinfo/util/texinfo.dtd
4131 --- texinfo.orig/util/texinfo.dtd 2004-12-19 16:08:55.000000000 +0100
4132 +++ texinfo/util/texinfo.dtd 2015-10-18 11:13:23.000000000 +0200
4133 @@ -1,4 +1,4 @@
4134 -<!-- $Id: texinfo.dtd,v 1.4 2004/12/19 15:08:55 karl Exp $
4135 +<!-- Id: texinfo.dtd,v 1.4 2004/12/19 15:08:55 karl Exp
4136 Document Type Definition for Texinfo.
4138 Author: Philippe Martin (feloy@free.fr)
4139 diff -rNU3 texinfo.orig/util/texinfo.xsl texinfo/util/texinfo.xsl
4140 --- texinfo.orig/util/texinfo.xsl 2004-04-11 19:56:47.000000000 +0200
4141 +++ texinfo/util/texinfo.xsl 2015-10-18 11:13:23.000000000 +0200
4142 @@ -1,5 +1,5 @@
4143 <?xml version='1.0'?>
4144 -<!-- $Id: texinfo.xsl,v 1.1 2004/04/11 17:56:47 karl Exp $ -->
4145 +<!-- Id: texinfo.xsl,v 1.1 2004/04/11 17:56:47 karl Exp -->
4146 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
4147 version="1.0">
4149 diff -rNU3 texinfo.orig/util/txitextest texinfo/util/txitextest
4150 --- texinfo.orig/util/txitextest 2004-04-11 19:56:47.000000000 +0200
4151 +++ texinfo/util/txitextest 2015-10-18 11:13:23.000000000 +0200
4152 @@ -1,5 +1,5 @@
4153 #!/bin/sh
4154 -# $Id: txitextest,v 1.5 2004/04/11 17:56:47 karl Exp $
4155 +# Id: txitextest,v 1.5 2004/04/11 17:56:47 karl Exp
4156 # Test texinfo.tex changes by running various manuals through with an
4157 # old version, saving the .ps result from dvips, doing the same with a
4158 # new version, and comparing. Idea from Stepan Kasal.