[Gsrc-commit] trunk r2859: update lilypond to 2.18.0

[Brandon Invergo]

------------------------------------------------------------
revno: 2859
revision-id: address@hidden
parent: address@hidden
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Sun 2014-03-09 10:10:42 +0000
message:
  update lilypond to 2.18.0
modified:
  gnu/lilypond/Makefile          makefile-20100606211655-sj1nx80alech6rtq-54
  gnu/lilypond/config.mk         config.mk-20121111221902-z28hh8721xmlhd36-1
  gnu/lilypond/sha256sums        checksums-20100606211658-5hzo8yox58j5nahg-54

=== modified file 'gnu/lilypond/Makefile'
--- a/gnu/lilypond/Makefile     2014-01-28 22:24:51 +0000
+++ b/gnu/lilypond/Makefile     2014-03-09 10:10:42 +0000
@@ -1,4 +1,4 @@
-# Copyright © 2013 Brandon Invergo <address@hidden>
+# Copyright © 2013, 2014 Brandon Invergo <address@hidden>
 #
 # This file is part of GSRC.
 #
@@ -17,7 +17,7 @@
 
 NAME = LilyPond
 GARNAME = lilypond
-GARVERSION = 2.16.2
+GARVERSION = 2.18.0
 HOME_URL = http://www.gnu.org/software/lilypond
 DESCRIPTION = Music typesetting
 define BLURB
@@ -39,14 +39,12 @@
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES =
 
-BUILDDEPS = automake autoconf ghostscript texinfo guile bison \
-           pkg-config fontforge python2 freetype2 pango fontconfig \
-        help2man texlive texinfo t1utils imagemagick flex perl
+BUILDDEPS = ghostscript texinfo guile bison pkg-config fontforge       \
+           python2 freetype2 pango fontconfig help2man texlive texinfo \
+           t1utils imagemagick flex perl db2latex
 LIBDEPS =
 
 ######################################################################
 
 include ../../gar.lib/auto.mk
 include config.mk
-
-CONFIGURE_ARGS += GUILE_CONFIG=$(prefix)/bin/guile-config

=== modified file 'gnu/lilypond/config.mk'
--- a/gnu/lilypond/config.mk    2012-11-11 22:19:09 +0000
+++ b/gnu/lilypond/config.mk    2014-03-09 10:10:42 +0000
@@ -1,4 +1,6 @@
 ## Configuration options for lilypond ##
 
-CONFIGURE_OPTS ?= TEXI2HTML=/usr/bin/texi2html
+# Lilypond only supports Guile 1.8, which is not provided by GSRC.  You must
+# supply the location of guile-config from Guile 1.8 below.
+CONFIGURE_OPTS ?= TEXI2HTML=/usr/bin/texi2any 
GUILE_CONFIG=/usr/bin/guile-config1.8
 BUILD_OPTS ?=

=== modified file 'gnu/lilypond/sha256sums'
--- a/gnu/lilypond/sha256sums   2013-11-14 21:57:02 +0000
+++ b/gnu/lilypond/sha256sums   2014-03-09 10:10:42 +0000
@@ -1,1 +1,1 @@
-1f4326cf8f9363076a83ce3cbe35f747188084f7492000ed3a7ccc3ce60aa1cb  
download/lilypond-2.16.2.tar.gz
+89059139a560a4900305b52d9327969cfcdedb061ed7bae310fdf5d4ba2aa230  
download/lilypond-2.18.0.tar.gz