3 files changed, 21 insertions, 16 deletions

diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index f7172e28762e..d5c477628c23 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=	lilypond
-PORTVERSION=	2.13.6
+PORTVERSION=	2.13.9
 CATEGORIES=	print audio
 MASTER_SITES=	http://download.linuxaudio.org/lilypond/sources/v2.13/:src \
     		${MASTER_SITE_LOCAL}/gahr/:fonts \
@@ -42,11 +42,9 @@ 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-changes lilypond-contributor lilypond-essay \
-		lilypond-extending lilypond-general lilypond-internals \
-		lilypond-learning lilypond-notation lilypond-usage \
-		music-glossary
+		lilypond-extending lilypond-internals lilypond-learning \
+		lilypond-notation lilypond-usage lilypond-web music-glossary
 
 USE_AUTOTOOLS=	autoconf:262
 USE_BISON=	build
@@ -57,7 +55,7 @@ USE_GNOME=	pango
 INSTALLS_OMF=	yes
 MAKEFILE=	GNUmakefile
 ALL_TARGET=	all
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" MAKEINFO="${LOCALBASE}/bin/makeinfo"
+CONFIGURE_ENV+=	MAKEINFO="${LOCALBASE}/bin/makeinfo"
 NOCCACHE=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
@@ -85,18 +83,22 @@ post-patch:
 	    ${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|<FlexLexer.h>|"/usr/include/FlexLexer.h"|' \
 	    ${WRKSRC}/lily/include/includable-lexer.hh
-#	Documentation in Spanish does not build...
-	${REINPLACE_CMD} -e '70s|es, ||' ${WRKSRC}/python/langdefs.py
 	${REINPLACE_CMD} -e 's|sed|gsed|g' ${WRKSRC}/Documentation/GNUmakefile
 .if defined(WITHOUT_NLS)
 	${REINPLACE_CMD} -e '17,21d' ${WRKSRC}/po/GNUmakefile
 .endif
 
+pre-install:
+.if exists(${PREFIX}/info/dir)
+	${REINPLACE_CMD} -i '' -e '/LilyPond/d' ${PREFIX}/info/dir
+.endif
+
 post-install:
 	@${LN} -s ${DATADIR}/${PORTVERSION} ${DATADIR}/current
 .if !defined(NOPORTDOCS) && defined(WITH_WEBDOCS)
 	@echo "Installing documentation... this takes a while..."
-	@(cd ${WRKSRC}/out-www/offline-root && ${COPYTREE_SHARE} \* ${DOCSDIR})
+	cd ${WRKSRC} && ${GMAKE} install-doc
+#	@(cd ${WRKSRC}/out-www/offline-root && ${COPYTREE_SHARE} \* ${DOCSDIR})
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/print/lilypond/distinfo b/print/lilypond/distinfo
index 5f78834428d6..bd56fe8e6ef6 100644
--- a/print/lilypond/distinfo
+++ b/print/lilypond/distinfo
@@ -1,9 +1,9 @@
-MD5 (lilypond-2.13.6.tar.gz) = 799ad1a80b9a44997fd956bd7df4932e
-SHA256 (lilypond-2.13.6.tar.gz) = 9236a4a75db00cecba594b4d2d817a0143eb03dfc406f504a9ee3ae21dd3b78b
-SIZE (lilypond-2.13.6.tar.gz) = 10296179
-MD5 (lilypond-fonts-2.13.6.tar.gz) = 20047b915956a581ddba76734d146af7
-SHA256 (lilypond-fonts-2.13.6.tar.gz) = bba392fae93c2d70d2ad65d62b2302049716339d351a2dd4a43992ab227f9a4e
-SIZE (lilypond-fonts-2.13.6.tar.gz) = 551090
+MD5 (lilypond-2.13.9.tar.gz) = b699c615966d862152ac7090310751e5
+SHA256 (lilypond-2.13.9.tar.gz) = a74cad0136ce54c77704ef05f4a98edbb4e6878ac3677b00cbc453b83ef872f4
+SIZE (lilypond-2.13.9.tar.gz) = 11620381
+MD5 (lilypond-fonts-2.13.9.tar.gz) = a9418a93f17441e57e009f5e4298b839
+SHA256 (lilypond-fonts-2.13.9.tar.gz) = c7eb4df9a6aa0af972cef65027b74bd4b537d196c4a88abf6b2e985833843c66
+SIZE (lilypond-fonts-2.13.9.tar.gz) = 551218
 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 9beb313a7bf7..f698bd51c5b4 100644
--- a/print/lilypond/pkg-plist
+++ b/print/lilypond/pkg-plist
@@ -1,3 +1,5 @@
+
+
 bin/lilypond-book
 bin/lilypond-invoke-editor
 bin/lilypond
@@ -165,6 +167,7 @@ share/locale/zh_TW/LC_MESSAGES/lilypond.mo
 %%DATADIR%%/%%PORTVERSION%%/ly/bagpipe.ly
 %%DATADIR%%/%%PORTVERSION%%/ly/catalan.ly
 %%DATADIR%%/%%PORTVERSION%%/ly/chord-modifiers-init.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/chord-repetition-init.ly
 %%DATADIR%%/%%PORTVERSION%%/ly/declarations-init.ly
 %%DATADIR%%/%%PORTVERSION%%/ly/deutsch.ly
 %%DATADIR%%/%%PORTVERSION%%/ly/drumpitch-init.ly
@@ -194,6 +197,7 @@ share/locale/zh_TW/LC_MESSAGES/lilypond.mo
 %%DATADIR%%/%%PORTVERSION%%/ly/predefined-fretboards-init.ly
 %%DATADIR%%/%%PORTVERSION%%/ly/predefined-guitar-fretboards.ly
 %%DATADIR%%/%%PORTVERSION%%/ly/predefined-guitar-ninth-fretboards.ly
+%%DATADIR%%/%%PORTVERSION%%/ly/predefined-ukulele-fretboards.ly
 %%DATADIR%%/%%PORTVERSION%%/ly/property-init.ly
 %%DATADIR%%/%%PORTVERSION%%/ly/scale-definitions-init.ly
 %%DATADIR%%/%%PORTVERSION%%/ly/script-init.ly
@@ -16857,4 +16861,3 @@ share/locale/zh_TW/LC_MESSAGES/lilypond.mo
 @dirrm %%DATADIR%%/%%PORTVERSION%%/dvips
 @dirrm %%DATADIR%%/%%PORTVERSION%%
 @dirrm %%DATADIR%%
-@dirrmtry info/dir