print/lilypond: Update to 2.22.1

https://lilypond.org/news.html#LilyPond-2_002e22_002e1-released-April-25_002c-2021

PR:		255482
Submitted by:	m.ne@gmx.net (maintainer)

3 files changed, 34 insertions, 34 deletions

diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index 1eab42c341e1..280661a5b2da 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -1,7 +1,7 @@
 # Created by: patrick, trevor
 
 PORTNAME=	lilypond
-DISTVERSION=	2.22.0
+DISTVERSION=	2.22.1
 CATEGORIES=	print audio
 MASTER_SITES=	http://lilypond.org/download/source/v${DISTVERSION:R}/
 
@@ -11,7 +11,7 @@ COMMENT=	GNU music typesetter
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	bash:shells/bash \
-		convert:graphics/ImageMagick6 \
+		convert:graphics/ImageMagick7 \
 		dblatex:textproc/dblatex \
 		fontforge:print/fontforge \
 		help2man:misc/help2man \
@@ -62,7 +62,7 @@ PLIST_SUB=	DISTVERSION=${DISTVERSION}
 OPTIONS_DEFINE=	GUILE2 NLS URW
 OPTIONS_SUB=	yes
 
-GUILE2_DESC=	Use guile2 (will incur some performance penalty)
+GUILE2_DESC=	guile2 instead guile (incurs performance penalty)
 URW_DESC=	Use bundled URW fonts
 
 GUILE2_LIB_DEPENDS=	libgc-threaded.so:devel/boehm-gc-threaded \
@@ -70,10 +70,10 @@ GUILE2_LIB_DEPENDS=	libgc-threaded.so:devel/boehm-gc-threaded \
 GUILE2_LIB_DEPENDS_OFF=	libguile.so:lang/guile1
 
 NLS_USES=	gettext
+NLS_USES_OFF=	gettext-tools
 
 URW_BUILD_DEPENDS=	urw-core35-fonts>0:x11-fonts/urw-core35-fonts
 URW_RUN_DEPENDS_OFF=	urw-core35-fonts>0:x11-fonts/urw-core35-fonts
-
 URW_CONFIGURE_WITH=	urwotf-dir=${LOCALBASE}/share/fonts/urw-core35-fonts
 
 post-patch:
diff --git a/print/lilypond/distinfo b/print/lilypond/distinfo
index adac289e1b5a..5c79010ea053 100644
--- a/print/lilypond/distinfo
+++ b/print/lilypond/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1610464888
-SHA256 (lilypond-2.22.0.tar.gz) = 64ddd03171d247adc243e01a3be3ec2610d97c62b893c253ad02ac50694b0f4e
-SIZE (lilypond-2.22.0.tar.gz) = 18023031
+TIMESTAMP = 1619692088
+SHA256 (lilypond-2.22.1.tar.gz) = 72ac2d54c310c3141c0b782d4e0bef9002d5519cf46632759b1f03ef6969cc30
+SIZE (lilypond-2.22.1.tar.gz) = 18033161
diff --git a/print/lilypond/pkg-plist b/print/lilypond/pkg-plist
index c644076e4f96..6e3d91c2992f 100644
--- a/print/lilypond/pkg-plist
+++ b/print/lilypond/pkg-plist
@@ -27,6 +27,18 @@ share/emacs/site-lisp/lilypond-what-beat.el
 share/emacs/site-lisp/lilypond-words.el
 %%DATADIR%%/%%DISTVERSION%%/fonts/00-lilypond-fonts.conf
 %%DATADIR%%/%%DISTVERSION%%/fonts/99-lilypond-fonts.conf
+%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/C059-BdIta.otf
+%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/C059-Bold.otf
+%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/C059-Italic.otf
+%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/C059-Roman.otf
+%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusMonoPS-Bold.otf
+%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusMonoPS-BoldItalic.otf
+%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusMonoPS-Italic.otf
+%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusMonoPS-Regular.otf
+%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusSans-Bold.otf
+%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusSans-BoldItalic.otf
+%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusSans-Italic.otf
+%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusSans-Regular.otf
 %%DATADIR%%/%%DISTVERSION%%/fonts/otf/emmentaler-11.otf
 %%DATADIR%%/%%DISTVERSION%%/fonts/otf/emmentaler-13.otf
 %%DATADIR%%/%%DISTVERSION%%/fonts/otf/emmentaler-14.otf
@@ -234,21 +246,21 @@ share/emacs/site-lisp/lilypond-words.el
 %%DATADIR%%/%%DISTVERSION%%/ps/encodingdefs.ps
 %%DATADIR%%/%%DISTVERSION%%/ps/lilyponddefs.ps
 %%DATADIR%%/%%DISTVERSION%%/ps/music-drawing-routines.ps
-%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/book_base.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/book_docbook.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/book_html.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/book_latex.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/book_snippets.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/book_texinfo.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/convertrules.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/fontextract.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/langdefs.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/lilylib.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/midi.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/musicexp.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/musicxml.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/musicxml2ly_conversion.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/utilities.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/book_base%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/book_docbook%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/book_html%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/book_latex%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/book_snippets%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/book_texinfo%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/convertrules%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/fontextract%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/langdefs%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/lilylib%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/midi%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/musicexp%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/musicxml%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/musicxml2ly_conversion%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/utilities%%PYTHON_EXT_SUFFIX%%.pyc
 %%DATADIR%%/%%DISTVERSION%%/python/book_base.py
 %%DATADIR%%/%%DISTVERSION%%/python/book_docbook.py
 %%DATADIR%%/%%DISTVERSION%%/python/book_html.py
@@ -380,15 +392,3 @@ share/emacs/site-lisp/lilypond-words.el
 %%NLS%%share/locale/uk/LC_MESSAGES/lilypond.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/lilypond.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/lilypond.mo
-%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/C059-BdIta.otf
-%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/C059-Bold.otf
-%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/C059-Italic.otf
-%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/C059-Roman.otf
-%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusMonoPS-Bold.otf
-%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusMonoPS-BoldItalic.otf
-%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusMonoPS-Italic.otf
-%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusMonoPS-Regular.otf
-%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusSans-Bold.otf
-%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusSans-BoldItalic.otf
-%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusSans-Italic.otf
-%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusSans-Regular.otf