- Update to 2.13.30

- Unbreak
- Disable installation of web docs (does not work)

3 files changed, 15 insertions, 14 deletions

diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index d3b1d172370e..3b1fba49ac25 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=	lilypond
-PORTVERSION=	2.13.26
+PORTVERSION=	2.13.30
 CATEGORIES=	print audio
 MASTER_SITES=	http://download.linuxaudio.org/lilypond/sources/v2.13/:src \
     		${MASTER_SITE_LOCAL}/gahr/:fonts \
@@ -34,12 +34,10 @@ LIB_DEPENDS=	guile.20:${PORTSDIR}/lang/guile \
 RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX \
     		mftrace:${PORTSDIR}/print/mftrace
 
-BROKEN=		does not build
-
 GONVILLE_REV=	r8724
 GONVILLE_SIZES=	11 13 14 16 18 20 23 26
 
-OPTIONS=	WEBDOCS	"Include web 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 \
@@ -47,7 +45,7 @@ MAN1=		lilymidi.1 lilypond-book.1 lilypond-invoke-editor.1 \
 INFO=		lilypond-changes lilypond-contributor lilypond-essay \
 		lilypond-extending lilypond-internals lilypond-learning \
 		lilypond-notation lilypond-usage lilypond-web \
-		lilypond-snippets music-glossary
+		music-glossary
 
 USE_AUTOTOOLS=	autoconf:262
 USE_BISON=	build
@@ -66,6 +64,7 @@ PLIST_SUB=	PORTVERSION=${PORTVERSION}
 .include <bsd.port.pre.mk>
 
 .if !defined(NOPORTDOCS) && defined(WITH_WEBDOCS)
+IGNORE=		installation of webdocs does not work
 BUILD_DEPENDS+=	pbmpscale:${PORTSDIR}/graphics/netpbm \
     		rsync:${PORTSDIR}/net/rsync
 PLIST_SUB+=	DOCS=""
diff --git a/print/lilypond/distinfo b/print/lilypond/distinfo
index b1072b7ade43..4f2ddf49f3bf 100644
--- a/print/lilypond/distinfo
+++ b/print/lilypond/distinfo
@@ -1,9 +1,9 @@
-MD5 (lilypond-2.13.26.tar.gz) = cae1a28aa30546b8ad9fe3e915d0e472
-SHA256 (lilypond-2.13.26.tar.gz) = 86e15c93c4218ce54ebd9a880c4d4d358bcbc5375ac99245d976021916ae2319
-SIZE (lilypond-2.13.26.tar.gz) = 13676268
-MD5 (lilypond-fonts-2.13.26.tar.gz) = e7884aa14b47a02d9d80a6dcc0f59329
-SHA256 (lilypond-fonts-2.13.26.tar.gz) = fcf21faac1efc01486089fb213a892e26d5c4e47cc51645f7b24c94dc6927744
-SIZE (lilypond-fonts-2.13.26.tar.gz) = 551229
+MD5 (lilypond-2.13.30.tar.gz) = 24f816246735fbbbe2a98aed9993e084
+SHA256 (lilypond-2.13.30.tar.gz) = 603fc40f9480a5fadbdfbc40d3978ebd3f9101a8043c2ef7999156bdeb434b5a
+SIZE (lilypond-2.13.30.tar.gz) = 13781404
+MD5 (lilypond-fonts-2.13.30.tar.gz) = c881c3cfdec31c580120ede22c987e5c
+SHA256 (lilypond-fonts-2.13.30.tar.gz) = eb69d2334d9582538aac91772d21a06c14431b80f8f92550111d40ed299a1514
+SIZE (lilypond-fonts-2.13.30.tar.gz) = 551233
 MD5 (gonville-r8724.tar.gz) = 82791c0c8085c033fcbabdf92e2b03b4
 SHA256 (gonville-r8724.tar.gz) = f04502dbf5b5b55a9e68353e1b2d8ff8d87c12cd4303464dd544b9d10c743f04
 SIZE (gonville-r8724.tar.gz) = 3684473
diff --git a/print/lilypond/pkg-plist b/print/lilypond/pkg-plist
index b011be0afdd0..2f4b2a2f1962 100644
--- a/print/lilypond/pkg-plist
+++ b/print/lilypond/pkg-plist
@@ -9,7 +9,6 @@ bin/convert-ly
 bin/etf2ly
 bin/midi2ly
 lib/lilypond/%%PORTVERSION%%/python/midi.so
-%%DATADIR%%/%%PORTVERSION%%/dvips/ps
 %%DATADIR%%/%%PORTVERSION%%/fonts/otf/CenturySchL-Bold.otf
 %%DATADIR%%/%%PORTVERSION%%/fonts/otf/CenturySchL-BoldItal.otf
 %%DATADIR%%/%%PORTVERSION%%/fonts/otf/CenturySchL-Ital.otf
@@ -201,7 +200,7 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
 %%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/bezier-tools.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/c++.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/chord-entry.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/chord-generic-names.scm
@@ -219,7 +218,9 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
 %%DATADIR%%/%%PORTVERSION%%/scm/define-music-properties.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/define-music-types.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/define-stencil-commands.scm
+%%DATADIR%%/%%PORTVERSION%%/scm/define-woodwind-diagrams.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/display-lily.scm
+%%DATADIR%%/%%PORTVERSION%%/scm/display-woodwind-diagrams.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/document-backend.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/document-functions.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/document-identifiers.scm
@@ -273,6 +274,7 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
 %%DATADIR%%/%%PORTVERSION%%/scm/standalone.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/stencil.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/tablature.scm
+%%DATADIR%%/%%PORTVERSION%%/scm/time-signature-settings.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/titling.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/to-xml.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/translation-functions.scm
@@ -348,9 +350,9 @@ share/locale/zh_TW/LC_MESSAGES/lilypond.mo
 @dirrm %%DATADIR%%/%%PORTVERSION%%/fonts/source
 @dirrm %%DATADIR%%/%%PORTVERSION%%/fonts/otf
 @dirrm %%DATADIR%%/%%PORTVERSION%%/fonts
-@dirrm %%DATADIR%%/%%PORTVERSION%%/dvips
 @dirrm %%DATADIR%%/%%PORTVERSION%%
 @dirrm %%DATADIR%%
 %%DOCS%%@dirrm share/omf/lilypond/%%PORTVERSION%%
 %%DOCS%%@dirrm share/omf/lilypond
 %%DOCS%%@dirrm share/omf
+