- Update to 2.18.0

  Changes: http://lilypond.org/doc/v2.18/Documentation/changes/

7 files changed, 43 insertions, 72 deletions

diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index c9e09af7cecb..ca0949837f67 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -2,67 +2,69 @@
 # $FreeBSD$
 
 PORTNAME=	lilypond
-PORTVERSION=	2.16.1
+PORTVERSION=	2.18.0
 CATEGORIES=	print audio
 MASTER_SITES=	http://download.linuxaudio.org/lilypond/sources/v${PORTVERSION:R}/
 
 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 \
+		convert:${PORTSDIR}/graphics/ImageMagick \
+		dblatex:${PORTSDIR}/textproc/dblatex \
 		fontforge:${PORTSDIR}/print/fontforge \
+		help2man:${PORTSDIR}/misc/help2man \
+		pngtopnm:${PORTSDIR}/graphics/netpbm \
+		rsync:${PORTSDIR}/net/rsync \
+		zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/share/ghostscript/fonts/c059033l.pfb:${PORTSDIR}/print/gsfonts
 
-LIB_DEPENDS=	guile:${PORTSDIR}/lang/guile \
-		gmp:${PORTSDIR}/math/gmp \
-		freetype:${PORTSDIR}/print/freetype2
-
 RUN_DEPENDS=	mftrace:${PORTSDIR}/print/mftrace \
 		${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
+LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile \
+		libgmp.so:${PORTSDIR}/math/gmp \
+		libfreetype.so:${PORTSDIR}/print/freetype2
 
-INFO=		lilypond-notation \
-		lilypond-usage \
-		lilypond-internals \
-		lilypond-learning \
+INFO=		internals \
 		lilypond-changes \
 		lilypond-contributor \
 		lilypond-essay \
 		lilypond-extending \
-		lilypond-snippets \
+		lilypond-internals \
+		lilypond-learning \
+		lilypond-notation \
+		lilypond-usage \
 		lilypond-web \
-		music-glossary \
-		internals
+		music-glossary
 
 USES=		bison:build gettext gmake pkgconfig perl5
 USE_GHOSTSCRIPT=9
 USE_TEX=	latex
-USE_PYTHON=	yes
+USE_PYTHON=	-3
 USE_PERL5=	build
 USE_GNOME=	pango
-USE_GCC=	any
 
 MAKEFILE=	GNUmakefile
 GNU_MAKEFILE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-ncsb-dir=${LOCALBASE}/share/ghostscript/fonts
+CONFIGURE_ARGS+=--with-ncsb-dir=${LOCALBASE}/share/ghostscript/fonts \
+		--with-python-include=${PYTHON_INCLUDEDIR}
 CONFIGURE_ENV+=	ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \
 		FLEX=${FLEX} YACC=${YACC}
 
 ALL_TARGET=	all
 
-NOCCACHE=	yes
+NO_CCACHE=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
@@ -74,11 +76,14 @@ PLIST_SUB+=	NLS="@comment "
 post-patch:
 	${REINPLACE_CMD} -e 's|<FlexLexer.h>|"/usr/include/FlexLexer.h"|' \
 	    ${WRKSRC}/lily/include/includable-lexer.hh
-.if empty(${PORT_OPTIONS:MNLS})
+.if !${PORT_OPTIONS:MNLS}
 	${REINPLACE_CMD} -e '/^PO_FILES/s|= |= #|' ${WRKSRC}/${MAKEFILE}.in
 .endif
 
 post-install:
-	@${LN} -fs ${DATADIR}/${PORTVERSION} ${DATADIR}/current
+	@${LN} -fs ${DATADIR}/${PORTVERSION} ${STAGEDIR}${DATADIR}/current
+
+regression-test: build
+	cd ${WRKSRC} && ${GMAKE} -f ${MAKEFILE} test
 
 .include <bsd.port.mk>
diff --git a/print/lilypond/distinfo b/print/lilypond/distinfo
index a921dbf44647..b1da665be62b 100644
--- a/print/lilypond/distinfo
+++ b/print/lilypond/distinfo
@@ -1,2 +1,2 @@
-SHA256 (lilypond-2.16.1.tar.gz) = f56e21fe92f29c88365eb6cf80b5be86a169e23cfb054ccbec457059f3df796e
-SIZE (lilypond-2.16.1.tar.gz) = 16061427
+SHA256 (lilypond-2.18.0.tar.gz) = 89059139a560a4900305b52d9327969cfcdedb061ed7bae310fdf5d4ba2aa230
+SIZE (lilypond-2.18.0.tar.gz) = 16013863
diff --git a/print/lilypond/files/patch-lily_freetype-error.cc b/print/lilypond/files/patch-lily_freetype-error.cc
deleted file mode 100644
index d729c4536253..000000000000
--- a/print/lilypond/files/patch-lily_freetype-error.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- lily/freetype-error.cc.orig	2013-12-16 15:18:38.000000000 +0100
-+++ lily/freetype-error.cc	2013-12-16 15:19:06.000000000 +0100
-@@ -31,7 +31,8 @@
-   const char *err_msg;
- } ft_errors[] =
- 
--#include <freetype/fterrors.h>
-+#include <ft2build.h>
-+#include FT_ERRORS_H
- 
-   ;
- 
diff --git a/print/lilypond/files/patch-lily_open-type-font.cc b/print/lilypond/files/patch-lily_open-type-font.cc
deleted file mode 100644
index 78d55522b016..000000000000
--- a/print/lilypond/files/patch-lily_open-type-font.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- lily/open-type-font.cc.orig	2013-12-16 15:54:16.000000000 +0100
-+++ lily/open-type-font.cc	2013-12-16 15:54:45.000000000 +0100
-@@ -23,7 +23,8 @@
- 
- using namespace std;
- 
--#include <freetype/tttables.h>
-+#include <ft2build.h>
-+#include FT_TRUETYPE_TABLES_H
- 
- #include "dimensions.hh"
- #include "international.hh"
diff --git a/print/lilypond/files/patch-lily_pango-font.cc b/print/lilypond/files/patch-lily_pango-font.cc
deleted file mode 100644
index 227a0444fd58..000000000000
--- a/print/lilypond/files/patch-lily_pango-font.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- lily/pango-font.cc.orig	2013-12-16 15:49:55.000000000 +0100
-+++ lily/pango-font.cc	2013-12-16 15:50:46.000000000 +0100
-@@ -22,7 +22,8 @@
- #define PANGO_ENABLE_BACKEND
- 
- #include <pango/pangoft2.h>
--#include <freetype/ftxf86.h>
-+#include <ft2build.h>
-+#include FT_XFREE86_H
- 
- #include <map>
- #include <cstdio>
diff --git a/print/lilypond/files/patch-lily_ttf.cc b/print/lilypond/files/patch-lily_ttf.cc
deleted file mode 100644
index 0211987989dc..000000000000
--- a/print/lilypond/files/patch-lily_ttf.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- lily/ttf.cc.orig	2013-12-16 15:48:08.000000000 +0100
-+++ lily/ttf.cc	2013-12-16 15:48:37.000000000 +0100
-@@ -20,7 +20,8 @@
- #include <cstdio>
- #include "freetype.hh"
- 
--#include <freetype/tttables.h>
-+#include <ft2build.h>
-+#include FT_TRUETYPE_TABLES_H
- 
- #include "international.hh"
- #include "memory-stream.hh"
diff --git a/print/lilypond/pkg-plist b/print/lilypond/pkg-plist
index d5d8ab00a611..fbaa719c4b7f 100644
--- a/print/lilypond/pkg-plist
+++ b/print/lilypond/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
@@ -222,6 +232,7 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
 %%DATADIR%%/%%PORTVERSION%%/python/rational.pyc
 %%DATADIR%%/%%PORTVERSION%%/python/safeeval.py
 %%DATADIR%%/%%PORTVERSION%%/python/safeeval.pyc
+%%DATADIR%%/%%PORTVERSION%%/scm/accreg.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/auto-beam.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/autochange.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/backend-library.scm
@@ -300,7 +311,9 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
 %%DATADIR%%/%%PORTVERSION%%/scm/ps-to-png.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/safe-lily.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/safe-utility-defs.scm
+%%DATADIR%%/%%PORTVERSION%%/scm/scheme-engravers.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/script.scm
+%%DATADIR%%/%%PORTVERSION%%/scm/skyline.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/song-util.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/song.scm
 %%DATADIR%%/%%PORTVERSION%%/scm/standalone.scm
@@ -328,6 +341,7 @@ share/emacs/site-lisp/lilypond-mode.el
 share/emacs/site-lisp/lilypond-song.el
 share/emacs/site-lisp/lilypond-what-beat.el
 share/emacs/site-lisp/lilypond-words.el
+%%NLS%%share/locale/ca/LC_MESSAGES/lilypond.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/lilypond.mo
 %%NLS%%share/locale/da/LC_MESSAGES/lilypond.mo
 %%NLS%%share/locale/de/LC_MESSAGES/lilypond.mo