Module Name: src
Committed By: msaitoh
Date: Fri Mar 27 15:08:32 UTC 2009
Modified Files:
src/gnu/dist/texinfo/doc [netbsd-5]: makeinfo.1
src/gnu/dist/texinfo/makeinfo [netbsd-5]: makeinfo.c makeinfo.h
src/share/mk [netbsd-5]: bsd.info.mk
Log Message:
Pull up following revision(s) (requested by joerg in ticket #548):
share/mk/bsd.info.mk: revision 1.39
gnu/dist/texinfo/makeinfo/makeinfo.h: revision 1.2
gnu/dist/texinfo/makeinfo/makeinfo.c: revision 1.15
gnu/dist/texinfo/makeinfo/makeinfo.c: revision 1.16
gnu/dist/texinfo/doc/makeinfo.1: revision 1.2
Teach makeinfo about --no-version-header to support the line
This is <info> producted by <version> from <source>
which leaks the full build prefix.
When processing texinfo sources, use --no-version-header to make the
build reproducable.
Escape new lines.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.6 -r1.1.1.6.4.1 src/gnu/dist/texinfo/doc/makeinfo.1
cvs rdiff -u -r1.14 -r1.14.4.1 src/gnu/dist/texinfo/makeinfo/makeinfo.c
cvs rdiff -u -r1.1.1.7 -r1.1.1.7.4.1 src/gnu/dist/texinfo/makeinfo/makeinfo.h
cvs rdiff -u -r1.38 -r1.38.26.1 src/share/mk/bsd.info.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/dist/texinfo/doc/makeinfo.1
diff -u src/gnu/dist/texinfo/doc/makeinfo.1:1.1.1.6 src/gnu/dist/texinfo/doc/makeinfo.1:1.1.1.6.4.1
--- src/gnu/dist/texinfo/doc/makeinfo.1:1.1.1.6 Tue Sep 2 07:51:56 2008
+++ src/gnu/dist/texinfo/doc/makeinfo.1 Fri Mar 27 15:08:32 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: makeinfo.1,v 1.1.1.6 2008/09/02 07:51:56 christos Exp $
+.\" $NetBSD: makeinfo.1,v 1.1.1.6.4.1 2009/03/27 15:08:32 msaitoh Exp $
.\"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.34.
.TH MAKEINFO "1" "December 2004" "makeinfo 4.8" "User Commands"
@@ -64,6 +64,9 @@
suppress splitting of Info or HTML output,
generate only one output file.
.TP
+\fB\-\-no\-version\-header\fR
+suppress header with makeinfo version and source path.
+.TP
\fB\-\-number\-sections\fR
output chapter and sectioning numbers.
.TP
Index: src/gnu/dist/texinfo/makeinfo/makeinfo.c
diff -u src/gnu/dist/texinfo/makeinfo/makeinfo.c:1.14 src/gnu/dist/texinfo/makeinfo/makeinfo.c:1.14.4.1
--- src/gnu/dist/texinfo/makeinfo/makeinfo.c:1.14 Tue Sep 2 08:00:24 2008
+++ src/gnu/dist/texinfo/makeinfo/makeinfo.c Fri Mar 27 15:08:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: makeinfo.c,v 1.14 2008/09/02 08:00:24 christos Exp $ */
+/* $NetBSD: makeinfo.c,v 1.14.4.1 2009/03/27 15:08:32 msaitoh Exp $ */
/* makeinfo -- convert Texinfo source into other formats.
Id: makeinfo.c,v 1.74 2004/12/19 17:15:42 karl Exp
@@ -381,6 +381,8 @@
also, write to standard output by default.\n\
--no-split suppress splitting of Info or HTML output,\n\
generate only one output file.\n\
+ --no-version-headers suppress header with makeinfo version and\n\
+ source path.\n\
--number-sections output chapter and sectioning numbers.\n\
-o, --output=FILE output to FILE (directory if split HTML),\n\
"));
@@ -505,6 +507,7 @@
{ "no-pointer-validate", 0, &validating, 0 },
{ "no-split", 0, &splitting, 0 },
{ "no-validate", 0, &validating, 0 },
+ { "no-version-header", 0, &no_version_header, 1 },
{ "no-warn", 0, &print_warnings, 0 },
{ "number-footnotes", 0, &number_footnotes, 1 },
{ "number-sections", 0, &number_sections, 1 },
@@ -1671,7 +1674,7 @@
}
/* html fixxme: should output this as trailer on first page. */
- if (!no_headers && !html && !xml)
+ if (!no_headers && !html && !xml && !no_version_header)
add_word_args (_("This is %s, produced by makeinfo version %s from %s.\n"),
output_filename, VERSION, input_filename);
Index: src/gnu/dist/texinfo/makeinfo/makeinfo.h
diff -u src/gnu/dist/texinfo/makeinfo/makeinfo.h:1.1.1.7 src/gnu/dist/texinfo/makeinfo/makeinfo.h:1.1.1.7.4.1
--- src/gnu/dist/texinfo/makeinfo/makeinfo.h:1.1.1.7 Tue Sep 2 07:50:44 2008
+++ src/gnu/dist/texinfo/makeinfo/makeinfo.h Fri Mar 27 15:08:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: makeinfo.h,v 1.1.1.7 2008/09/02 07:50:44 christos Exp $ */
+/* $NetBSD: makeinfo.h,v 1.1.1.7.4.1 2009/03/27 15:08:32 msaitoh Exp $ */
/* makeinfo.h -- declarations for Makeinfo.
Id: makeinfo.h,v 1.17 2004/11/30 02:03:23 karl Exp
@@ -192,6 +192,10 @@
is, generate plain text. (--no-headers) */
DECLARE (int, no_headers, 0);
+/* Nonzero means do not output makeinfo version and source file.
+ (--no-version-header) */
+DECLARE (int, no_version_header, 0);
+
/* Nonzero means that we process @docbook and @ifdocbook. (--ifdocbook) */
DECLARE (int, process_docbook, 0);
Index: src/share/mk/bsd.info.mk
diff -u src/share/mk/bsd.info.mk:1.38 src/share/mk/bsd.info.mk:1.38.26.1
--- src/share/mk/bsd.info.mk:1.38 Thu Mar 16 18:43:34 2006
+++ src/share/mk/bsd.info.mk Fri Mar 27 15:08:32 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.info.mk,v 1.38 2006/03/16 18:43:34 jwise Exp $
+# $NetBSD: bsd.info.mk,v 1.38.26.1 2009/03/27 15:08:32 msaitoh Exp $
.include <bsd.init.mk>
@@ -23,7 +23,7 @@
.txi.info .texi.info .texinfo.info:
${_MKTARGET_CREATE}
- ${TOOL_MAKEINFO} ${INFOFLAGS} --no-split -o ${.TARGET} ${.IMPSRC}
+ ${TOOL_MAKEINFO} ${INFOFLAGS} --no-split --no-version-header -o ${.TARGET} ${.IMPSRC}
.endif # ${MKINFO} != "no"
