3 files changed, 16 insertions, 26 deletions

diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index f38d81c774be..d91db322050a 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -8,8 +8,7 @@
 #
 
 PORTNAME=	lilypond
-PORTVERSION=	2.13.3
-PORTREVISION=	1
+PORTVERSION=	2.13.5
 CATEGORIES=	print audio
 MASTER_SITES=	http://download.linuxaudio.org/lilypond/sources/v2.13/:src \
     		${MASTER_SITE_LOCAL}/gahr/:fonts \
@@ -32,13 +31,14 @@ LIB_DEPENDS=	guile.20:${PORTSDIR}/lang/guile \
 RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX \
     		mftrace:${PORTSDIR}/print/mftrace
 
-OPTIONS=	WEBDOCS	"Build and install documentation" off
+OPTIONS=	WEBDOCS	"Include web documentation" off
 
 MAN1=		lilymidi.1 lilypond-book.1 lilypond-invoke-editor.1 \
 		lilypond.1 lilysong.1 convert-ly.1 abc2ly.1 etf2ly.1 \
 		midi2ly.1 musicxml2ly.1
-INFO=		lilypond lilypond-internals lilypond-program lilypond-learning \
-		music-glossary
+INFO=		lilypond-internals lilypond-learning lilypond-usage \
+		music-glossary lilypond-changes lilypond-essay \
+		lilypond-notation lilypond-general lilypond-contributor
 
 USE_AUTOTOOLS=	autoconf:262
 USE_BISON=	build
diff --git a/print/lilypond/distinfo b/print/lilypond/distinfo
index 18a812dbd2fd..13324ccc11d0 100644
--- a/print/lilypond/distinfo
+++ b/print/lilypond/distinfo
@@ -1,6 +1,6 @@
-MD5 (lilypond-2.13.3.tar.gz) = f7d80460e20db14c5178c61d39e6634e
-SHA256 (lilypond-2.13.3.tar.gz) = 4c6d3618ccfad8a29d5678681b13676131163ae99b9b79b4d503a7d0ee9b16c6
-SIZE (lilypond-2.13.3.tar.gz) = 4876656
-MD5 (lilypond-fonts-2.13.3.tar.gz) = 8f45cb65f82af6cb1f1c0fbf794106b1
-SHA256 (lilypond-fonts-2.13.3.tar.gz) = 8f4a03d69b6773e703091dfb601d85b46ffc4a6df7e4d66394e0387dff9d6c78
-SIZE (lilypond-fonts-2.13.3.tar.gz) = 548670
+MD5 (lilypond-2.13.5.tar.gz) = 1ee3c732368e85048418cf652b3a7ced
+SHA256 (lilypond-2.13.5.tar.gz) = 99e5063c4e183ad151ec365acbaeadacfe71745dd5c4bc9c51e99cb1490d239d
+SIZE (lilypond-2.13.5.tar.gz) = 9879920
+MD5 (lilypond-fonts-2.13.5.tar.gz) = 68583714bdf27c778f4e4c97f68c393d
+SHA256 (lilypond-fonts-2.13.5.tar.gz) = 45ff9c83453515b7128e24a7728ad6117bf5ca346b739221f8c2e96ce7959033
+SIZE (lilypond-fonts-2.13.5.tar.gz) = 548763
diff --git a/print/lilypond/pkg-plist b/print/lilypond/pkg-plist
index adf3f2411d21..9beb313a7bf7 100644
--- a/print/lilypond/pkg-plist
+++ b/print/lilypond/pkg-plist
@@ -31,15 +31,6 @@ share/locale/tr/LC_MESSAGES/lilypond.mo
 share/locale/uk/LC_MESSAGES/lilypond.mo
 share/locale/vi/LC_MESSAGES/lilypond.mo
 share/locale/zh_TW/LC_MESSAGES/lilypond.mo
-share/omf/lilypond/%%PORTVERSION%%/lilypond-internals.html.omf
-share/omf/lilypond/%%PORTVERSION%%/lilypond-learning.html.omf
-share/omf/lilypond/%%PORTVERSION%%/lilypond-learning.pdf.omf
-share/omf/lilypond/%%PORTVERSION%%/lilypond-program.html.omf
-share/omf/lilypond/%%PORTVERSION%%/lilypond-program.pdf.omf
-share/omf/lilypond/%%PORTVERSION%%/lilypond.html.omf
-share/omf/lilypond/%%PORTVERSION%%/lilypond.pdf.omf
-share/omf/lilypond/%%PORTVERSION%%/music-glossary.html.omf
-share/omf/lilypond/%%PORTVERSION%%/music-glossary.pdf.omf
 %%DATADIR%%/%%PORTVERSION%%/dvips/ps
 %%DATADIR%%/%%PORTVERSION%%/fonts/otf/CenturySchL-Bold.otf
 %%DATADIR%%/%%PORTVERSION%%/fonts/otf/CenturySchL-BoldItal.otf
@@ -187,6 +178,7 @@ share/omf/lilypond/%%PORTVERSION%%/music-glossary.pdf.omf
 %%DATADIR%%/%%PORTVERSION%%/ly/grace-init.ly
 %%DATADIR%%/%%PORTVERSION%%/ly/graphviz-init.ly
 %%DATADIR%%/%%PORTVERSION%%/ly/gregorian.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/guile-debugger.ly
 %%DATADIR%%/%%PORTVERSION%%/ly/init.ly
 %%DATADIR%%/%%PORTVERSION%%/ly/italiano.ly
 %%DATADIR%%/%%PORTVERSION%%/ly/lilypond-book-preamble.ly
@@ -197,7 +189,6 @@ share/omf/lilypond/%%PORTVERSION%%/music-glossary.pdf.omf
 %%DATADIR%%/%%PORTVERSION%%/ly/nederlands.ly
 %%DATADIR%%/%%PORTVERSION%%/ly/norsk.ly
 %%DATADIR%%/%%PORTVERSION%%/ly/paper-defaults-init.ly
-%%DATADIR%%/%%PORTVERSION%%/ly/params-init.ly
 %%DATADIR%%/%%PORTVERSION%%/ly/performer-init.ly
 %%DATADIR%%/%%PORTVERSION%%/ly/portugues.ly
 %%DATADIR%%/%%PORTVERSION%%/ly/predefined-fretboards-init.ly
@@ -233,6 +224,7 @@ share/omf/lilypond/%%PORTVERSION%%/music-glossary.pdf.omf
 %%DATADIR%%/%%PORTVERSION%%/scm/auto-beam.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/autochange.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/backend-library.scm
+%%DATADIR%%/%%PORTVERSION%%/scm/beam-settings.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/c++.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/chord-entry.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/chord-generic-names.scm
@@ -273,12 +265,10 @@ share/omf/lilypond/%%PORTVERSION%%/music-glossary.pdf.omf
 %%DATADIR%%/%%PORTVERSION%%/scm/fret-diagrams.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/graphviz.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/harp-pedals.scm
-%%DATADIR%%/%%PORTVERSION%%/scm/kpathsea.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/layout-beam.scm
-%%DATADIR%%/%%PORTVERSION%%/scm/layout-page-dump.scm
-%%DATADIR%%/%%PORTVERSION%%/scm/layout-page-layout.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/layout-slur.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/lily-library.scm
+%%DATADIR%%/%%PORTVERSION%%/scm/lily-sort.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/lily.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/ly-syntax-constructors.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/markup.scm
@@ -303,6 +293,7 @@ share/omf/lilypond/%%PORTVERSION%%/music-glossary.pdf.omf
 %%DATADIR%%/%%PORTVERSION%%/scm/song.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/standalone.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/stencil.scm
+%%DATADIR%%/%%PORTVERSION%%/scm/tablature.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/titling.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/to-xml.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/translation-functions.scm
@@ -16847,8 +16838,6 @@ share/omf/lilypond/%%PORTVERSION%%/music-glossary.pdf.omf
 @dirrm lib/lilypond/%%PORTVERSION%%/python
 @dirrm lib/lilypond/%%PORTVERSION%%
 @dirrm lib/lilypond
-@dirrm share/omf/lilypond/%%PORTVERSION%%
-@dirrm share/omf/lilypond
 @dirrm %%DATADIR%%/%%PORTVERSION%%/vim/syntax
 @dirrm %%DATADIR%%/%%PORTVERSION%%/vim/indent
 @dirrm %%DATADIR%%/%%PORTVERSION%%/vim/ftplugin
@@ -16868,3 +16857,4 @@ share/omf/lilypond/%%PORTVERSION%%/music-glossary.pdf.omf
 @dirrm %%DATADIR%%/%%PORTVERSION%%/dvips
 @dirrm %%DATADIR%%/%%PORTVERSION%%
 @dirrm %%DATADIR%%
+@dirrmtry info/dir