Fixes for building documentation with texinfo-5.x, from Don Armstrong

<don@debian.org>.

6 files changed, 190 insertions, 1 deletions

diff --git a/print/lilypond/distinfo b/print/lilypond/distinfo
index c6aa2ffcf6d..f9b0258c3ae 100644
--- a/print/lilypond/distinfo
+++ b/print/lilypond/distinfo
@@ -1,8 +1,13 @@
-$NetBSD: distinfo,v 1.18 2013/06/16 20:46:52 joerg Exp $
+$NetBSD: distinfo,v 1.19 2013/07/05 14:51:43 wiz Exp $
 
 SHA1 (lilypond-2.16.2.tar.gz) = 1eb3b0e5c117a8669dba19ab28f933351e51e39a
 RMD160 (lilypond-2.16.2.tar.gz) = bbb68ef05e81d8d9f5cf7ac26cffb5ab3935c61a
 Size (lilypond-2.16.2.tar.gz) = 16062982 bytes
+SHA1 (patch-Documentation_changes.tely) = 0a3ac0e406ba7fd555f5f527e599fc07a6e8cd67
+SHA1 (patch-Documentation_contributor_quick-start.itexi) = e2925b8bdc45f7b84ce8aa66a96262f9351b664e
+SHA1 (patch-Documentation_included_compile.itexi) = b7f55dd2f794ce1e03c952b23a03da4d0febf1ba
+SHA1 (patch-Documentation_topdocs_INSTALL.texi) = 801ab4f9656cd551084119ec185a0e0ef8acb594
+SHA1 (patch-Documentation_usage_lilypond-book.itely) = b9a4d7c83d3d1bc98fb1d1c1106cbe081a0f3b66
 SHA1 (patch-aa) = 99dc3ecc7df664fba71d850e6c0b253fc451ec61
 SHA1 (patch-ab) = 08bf158aed8f6cbaf11d054716069486cf393d6b
 SHA1 (patch-ac) = ca7a8671885a40201f201431d2eb8a3377993c67
diff --git a/print/lilypond/patches/patch-Documentation_changes.tely b/print/lilypond/patches/patch-Documentation_changes.tely
new file mode 100644
index 00000000000..3e664cb10f5
--- /dev/null
+++ b/print/lilypond/patches/patch-Documentation_changes.tely
@@ -0,0 +1,15 @@
+$NetBSD: patch-Documentation_changes.tely,v 1.1 2013/07/05 14:51:43 wiz Exp $
+
+Fix for texinfo-5.x, from Don Armstrong <don@debian.org>.
+
+--- Documentation/changes.tely.orig	2013-01-04 13:41:57.000000000 +0000
++++ Documentation/changes.tely
+@@ -36,7 +36,7 @@ See user manual, \NAME\
+ @finalout
+ 
+ @node Top, Fixes and changes after 2.16.0, (dir), (dir)
+-@top New features in 2.16
++@chapter New features in 2.16
+ 
+ @menu
+ * Fixes and changes after 2.16.0::
diff --git a/print/lilypond/patches/patch-Documentation_contributor_quick-start.itexi b/print/lilypond/patches/patch-Documentation_contributor_quick-start.itexi
new file mode 100644
index 00000000000..1343826ecf0
--- /dev/null
+++ b/print/lilypond/patches/patch-Documentation_contributor_quick-start.itexi
@@ -0,0 +1,15 @@
+$NetBSD: patch-Documentation_contributor_quick-start.itexi,v 1.1 2013/07/05 14:51:43 wiz Exp $
+
+Fix for texinfo-5.x, from Don Armstrong <don@debian.org>.
+
+--- Documentation/contributor/quick-start.itexi.orig	2013-01-04 13:41:57.000000000 +0000
++++ Documentation/contributor/quick-start.itexi
+@@ -344,7 +344,7 @@ to @ref{Compiling with LilyDev} before r
+ @warning{Throughout the rest of this manual, most command-line
+ input should be entered from @file{~/lilypond-git/}.  This is
+ known as the @emph{top source directory} and is often referred to as
+-@var{$LILYPOND_GIT}}.
++@var{$LILYPOND_GIT}.}
+ 
+ @warning{Only work on one set of changes at once.  Do not start
+ work on any new changes until your first set has been accepted.}
diff --git a/print/lilypond/patches/patch-Documentation_included_compile.itexi b/print/lilypond/patches/patch-Documentation_included_compile.itexi
new file mode 100644
index 00000000000..d140029525e
--- /dev/null
+++ b/print/lilypond/patches/patch-Documentation_included_compile.itexi
@@ -0,0 +1,69 @@
+$NetBSD: patch-Documentation_included_compile.itexi,v 1.1 2013/07/05 14:51:43 wiz Exp $
+
+Fix for texinfo-5.x, from Don Armstrong <don@debian.org>.
+
+--- Documentation/included/compile.itexi.orig	2013-01-04 13:41:57.000000000 +0000
++++ Documentation/included/compile.itexi
+@@ -922,7 +922,7 @@ bug reports to @email{bug-lilypond@@gnu.
+ 
+ Bugs that are not fault of LilyPond are documented here.
+ 
+-@unnumberedsubsubsec Bison 1.875
++@unnumberedsubsec Bison 1.875
+ 
+ There is a bug in bison-1.875: compilation fails with "parse error
+ before `goto'" in line 4922 due to a bug in bison.  To fix, please
+@@ -937,7 +937,7 @@ $ make
+ @end example
+ 
+ 
+-@unnumberedsubsubsec Compiling on MacOS@tie{}X
++@unnumberedsubsec Compiling on MacOS@tie{}X
+ 
+ Here are special instructions for compiling under MacOS@tie{}X.
+ These instructions assume that dependencies are installed using
+@@ -989,7 +989,7 @@ automatic font detection, add
+ @end example
+ 
+ 
+-@unnumberedsubsubsec Solaris
++@unnumberedsubsec Solaris
+ 
+ Solaris7, ./configure
+ 
+@@ -1008,7 +1008,7 @@ or
+ CONFIG_SHELL=/bin/bash bash -c ./configure
+ @end example
+ 
+-@unnumberedsubsubsec FreeBSD
++@unnumberedsubsec FreeBSD
+ 
+ To use system fonts, dejaview must be installed.  With the default
+ port, the fonts are installed in @file{usr/X11R6/lib/X11/fonts/dejavu}.
+@@ -1022,7 +1022,7 @@ for your hierarchy.)
+ @end example
+ 
+ 
+-@unnumberedsubsubsec International fonts
++@unnumberedsubsec International fonts
+ 
+ On Mac OS X, all fonts are installed by default.  However, finding all
+ system fonts requires a bit of configuration; see
+@@ -1049,7 +1049,7 @@ Debian GNU/Linux
+ @end verbatim
+ 
+ 
+-@unnumberedsubsubsec Using lilypond python libraries
++@unnumberedsubsec Using lilypond python libraries
+ 
+ If you want to use lilypond's python libraries (either running
+ certain build scripts manually, or using them in other programs),
+@@ -1123,7 +1123,7 @@ We currently use make and stepmake, whic
+ used by us.  Hopefully this will change in the future.
+ 
+ 
+-@subsubheading Version-specific texinfo macros
++@subheading Version-specific texinfo macros
+ 
+ @itemize
+ 
diff --git a/print/lilypond/patches/patch-Documentation_topdocs_INSTALL.texi b/print/lilypond/patches/patch-Documentation_topdocs_INSTALL.texi
new file mode 100644
index 00000000000..9cbfc878588
--- /dev/null
+++ b/print/lilypond/patches/patch-Documentation_topdocs_INSTALL.texi
@@ -0,0 +1,25 @@
+$NetBSD: patch-Documentation_topdocs_INSTALL.texi,v 1.1 2013/07/05 14:51:43 wiz Exp $
+
+Fix for texinfo-5.x, from Don Armstrong <don@debian.org>.
+
+--- Documentation/topdocs/INSTALL.texi.orig	2013-01-04 13:41:56.000000000 +0000
++++ Documentation/topdocs/INSTALL.texi
+@@ -10,9 +10,18 @@
+ @node Top
+ @top
+ 
++@menu
++* Compile::
++@end menu
++
++
+ @contents
+ 
+ @include macros.itexi
++
++@node Compile
++@chapter Compile
++
+ @include included/compile.itexi
+ 
+ @bye
diff --git a/print/lilypond/patches/patch-Documentation_usage_lilypond-book.itely b/print/lilypond/patches/patch-Documentation_usage_lilypond-book.itely
new file mode 100644
index 00000000000..40c36b0c665
--- /dev/null
+++ b/print/lilypond/patches/patch-Documentation_usage_lilypond-book.itely
@@ -0,0 +1,60 @@
+$NetBSD: patch-Documentation_usage_lilypond-book.itely,v 1.1 2013/07/05 14:51:43 wiz Exp $
+
+Fix for texinfo-5.x, from Don Armstrong <don@debian.org>.
+
+--- Documentation/usage/lilypond-book.itely.orig	2013-01-04 13:41:57.000000000 +0000
++++ Documentation/usage/lilypond-book.itely
+@@ -1001,20 +1001,20 @@ cd out
+ ...
+ @end example
+ 
+-@itemx --skip-lily-check
++@item --skip-lily-check
+ Do not fail if no lilypond output is found.  It is used for LilyPond
+ Info documentation without images.
+ 
+-@itemx --skip-png-check
++@item --skip-png-check
+ Do not fail if no PNG images are found for EPS files.  It is used for
+ LilyPond Info documentation without images.
+ 
+-@itemx --lily-output-dir=@var{dir}
++@item --lily-output-dir=@var{dir}
+ Write lily-XXX files to directory @var{dir}, link into @option{--output}
+ directory.  Use this option to save building time for documents in
+ different directories which share a lot of identical snippets.
+ 
+-@itemx --lily-loglevel=@var{loglevel}
++@item --lily-loglevel=@var{loglevel}
+ Set the output verbosity of the invoked @command{lilypond} calls to
+ @var{loglevel}.  Possible values are @code{NONE}, @code{ERROR},
+ @code{WARNING}, @code{BASIC_PROGRESS}, @code{PROGRESS}, @code{INFO}
+@@ -1023,16 +1023,16 @@ environment variable @code{LILYPOND_LOGL
+ as the loglevel.
+ 
+ 
+-@itemx --info-images-dir=@var{dir}
++@item --info-images-dir=@var{dir}
+ Format Texinfo output so that Info will look for images of music in
+ @var{dir}.
+ 
+-@itemx --latex-program=@var{prog}
++@item --latex-program=@var{prog}
+ Run executable @command{prog} instead of @command{latex}.  This is
+ useful if your document is processed with @command{xelatex}, for
+ example.
+ 
+-@itemx --left-padding=@var{amount}
++@item --left-padding=@var{amount}
+ Pad EPS boxes by this much.  @var{amount} is measured in millimeters,
+ and is 3.0 by default.  This option should be used if the lines of
+ music stick out of the right margin.
+@@ -1055,7 +1055,7 @@ Create PDF files for use with PDF@LaTeX{
+ By default, output is displayed on the terminal.  This option redirects
+ all output to log files in the same directory as the source files.
+ 
+-@itemx --use-source-file-names
++@item --use-source-file-names
+ Write snippet output files with the same base name as their source file.
+ This option works only for snippets included with @code{lilypondfile}
+ and only if directories implied by @option{--output-dir} and