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