3 files changed, 20 insertions, 13 deletions

diff --git a/print/lilypond-devel/Makefile b/print/lilypond-devel/Makefile
index 0521cc46f693..5e01251c6500 100644
--- a/print/lilypond-devel/Makefile
+++ b/print/lilypond-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	lilypond
-PORTVERSION=	2.17.26
+PORTVERSION=	2.17.97
 CATEGORIES=	print audio
 MASTER_SITES=	http://download.linuxaudio.org/lilypond/sources/v${PORTVERSION:R}/
 PKGNAMESUFFIX=	-devel
@@ -10,15 +10,17 @@ PKGNAMESUFFIX=	-devel
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	The GNU music typesetter
 
+LICENSE=	GPLv3
+
 BUILD_DEPENDS=	pdftexi2dvi:${PORTSDIR}/print/texinfo \
 		t1ascii:${PORTSDIR}/print/t1utils \
 		bash:${PORTSDIR}/shells/bash \
 		fontforge:${PORTSDIR}/print/fontforge \
 		${LOCALBASE}/share/ghostscript/fonts/c059033l.pfb:${PORTSDIR}/print/gsfonts
 
-LIB_DEPENDS=	guile:${PORTSDIR}/lang/guile \
-		gmp:${PORTSDIR}/math/gmp \
-		freetype:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile \
+		libgmp.so:${PORTSDIR}/math/gmp \
+		libfreetype.so:${PORTSDIR}/print/freetype2
 
 RUN_DEPENDS=	dblatex:${PORTSDIR}/textproc/dblatex \
 		mftrace:${PORTSDIR}/print/mftrace \
@@ -26,10 +28,6 @@ RUN_DEPENDS=	dblatex:${PORTSDIR}/textproc/dblatex \
 		convert:${PORTSDIR}/graphics/ImageMagick \
 		${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans-Bold.ttf:${PORTSDIR}/x11-fonts/dejavu
 
-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-notation \
 		lilypond-usage \
 		lilypond-internals \
@@ -45,7 +43,7 @@ INFO=		lilypond-notation \
 
 USES=		bison gettext gmake pkgconfig perl5
 USE_GHOSTSCRIPT=9
-USE_PYTHON=	yes
+USE_PYTHON=	2
 USE_PERL5=	build
 USE_TEX=	latex
 USE_GNOME=	pango
@@ -65,7 +63,6 @@ NOCCACHE=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
@@ -82,6 +79,6 @@ post-patch:
 .endif
 
 post-install:
-	@${LN} -fs ${DATADIR}/${PORTVERSION} ${DATADIR}/current
+	@${LN} -fs ${DATADIR}/${PORTVERSION} ${STAGEDIR}${DATADIR}/current
 
 .include <bsd.port.mk>
diff --git a/print/lilypond-devel/distinfo b/print/lilypond-devel/distinfo
index 213217c57bb0..85eb70546f61 100644
--- a/print/lilypond-devel/distinfo
+++ b/print/lilypond-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (lilypond-2.17.26.tar.gz) = 76f9d1c0302a4cf42a39dfc5876e6e3560b1f9c999a054d40129b1dece07cc2e
-SIZE (lilypond-2.17.26.tar.gz) = 15953761
+SHA256 (lilypond-2.17.97.tar.gz) = ca8d1bc03f35399d40f768d773282e44c903a6315669d0cd385fb0c473d4aebf
+SIZE (lilypond-2.17.97.tar.gz) = 15982053
diff --git a/print/lilypond-devel/pkg-plist b/print/lilypond-devel/pkg-plist
index 2d3cb316d753..fbaa719c4b7f 100644
--- a/print/lilypond-devel/pkg-plist
+++ b/print/lilypond-devel/pkg-plist
@@ -8,6 +8,16 @@ bin/abc2ly
 bin/convert-ly
 bin/etf2ly
 bin/midi2ly
+man/man1/lilymidi.1.gz
+man/man1/lilypond-book.1.gz
+man/man1/lilypond-invoke-editor.1.gz
+man/man1/lilypond.1.gz
+man/man1/lilysong.1.gz
+man/man1/convert-ly.1.gz
+man/man1/abc2ly.1.gz
+man/man1/etf2ly.1.gz
+man/man1/midi2ly.1.gz
+man/man1/musicxml2ly.1.gz
 lib/lilypond/%%PORTVERSION%%/python/midi.so
 %%DATADIR%%/%%PORTVERSION%%/fonts/otf/CenturySchL-Bold.otf
 %%DATADIR%%/%%PORTVERSION%%/fonts/otf/CenturySchL-BoldItal.otf