print/lilypond-devel: update to 2.21.5

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

5 files changed, 26 insertions, 19 deletions

diff --git a/print/lilypond-devel/Makefile b/print/lilypond-devel/Makefile
index 6204b8117264..b8a97a0cec02 100644
--- a/print/lilypond-devel/Makefile
+++ b/print/lilypond-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	lilypond
-DISTVERSION=	2.21.3
+DISTVERSION=	2.21.5
 CATEGORIES=	print audio
 MASTER_SITES=	http://lilypond.org/download/source/v${DISTVERSION:R}/
 PKGNAMESUFFIX=	-devel
diff --git a/print/lilypond-devel/distinfo b/print/lilypond-devel/distinfo
index 8040fe4b4bb8..af861c0bf89e 100644
--- a/print/lilypond-devel/distinfo
+++ b/print/lilypond-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1595125665
-SHA256 (lilypond-2.21.3.tar.gz) = 927975f3357c53369900425dcd88925022d32b597756226cee5fafb7ba798397
-SIZE (lilypond-2.21.3.tar.gz) = 17985310
+TIMESTAMP = 1597667426
+SHA256 (lilypond-2.21.5.tar.gz) = 09d05285fd334113b91b14a9d8d19fc0e086bec5868b69c73a61f9ea218a96cb
+SIZE (lilypond-2.21.5.tar.gz) = 18005124
diff --git a/print/lilypond-devel/files/patch-Documentation_GNUmakefile b/print/lilypond-devel/files/patch-Documentation_GNUmakefile
index 402b19f41788..df8dba5740ee 100644
--- a/print/lilypond-devel/files/patch-Documentation_GNUmakefile
+++ b/print/lilypond-devel/files/patch-Documentation_GNUmakefile
@@ -1,14 +1,23 @@
---- Documentation/GNUmakefile.orig	2020-07-13 14:02:44 UTC
+--- Documentation/GNUmakefile.orig	2020-08-16 10:58:56 UTC
 +++ Documentation/GNUmakefile
-@@ -70,9 +70,9 @@ source-links = $(outdir)/source\
- MAIN_INFO_DOC = lilypond-web
- INFO_DOCS = lilypond-usage lilypond-changes lilypond-contributor lilypond-internals \
-  lilypond-essay lilypond-learning lilypond-notation music-glossary \
-- lilypond-web lilypond-extending
-+ lilypond-web lilypond-extending lilypond-snippets internals
+@@ -147,6 +147,7 @@ INFO_DOCS = \
+   lilypond-internals \
+   lilypond-learning \
+   lilypond-notation \
++  lilypond-snippets \
+   lilypond-usage \
+   music-glossary
+ # Some info files should only be processed if `$(out)` is equal to
+@@ -156,11 +157,9 @@ INFO_DOCS = \
+ # more entries that are no longer present.
+ ALL_INFO_DOCS = \
+   $(INFO_DOCS) \
+-  lilypond-snippets \
+   lilypond-web
  ifeq ($(out),www)
--INFO_DOCS += lilypond-snippets
-+INFO_DOCS += 
+-INFO_DOCS += lilypond-snippets \
+-             lilypond-web
++INFO_DOCS += lilypond-web
  endif
  INFO_FILES = $(INFO_DOCS:%=$(outdir)/%.info)
- 
+ ALL_INFO_FILES = $(ALL_INFO_DOCS:%=$(outdir)/%.info)
diff --git a/print/lilypond-devel/files/patch-config.make.in b/print/lilypond-devel/files/patch-config.make.in
index f1c3864216d9..1a5ed7480e7e 100644
--- a/print/lilypond-devel/files/patch-config.make.in
+++ b/print/lilypond-devel/files/patch-config.make.in
@@ -1,11 +1,11 @@
---- config.make.in.orig	2020-07-13 14:02:44 UTC
+--- config.make.in.orig	2020-08-16 10:58:56 UTC
 +++ config.make.in
-@@ -98,7 +98,7 @@ mandir = @mandir@
+@@ -94,7 +94,7 @@ mandir = @mandir@
  package = lilypond
  package_datadir = $(datadir)/$(package)
  package_docdir = $(docdir)/$(package)
 -package_infodir = $(infodir)/$(package)
 +package_infodir = $(infodir)
- package_libdir = $(libdir)/$(package)
  prefix = @prefix@
  program_prefix = @program_prefix@
+ program_suffix = @program_suffix@
diff --git a/print/lilypond-devel/pkg-plist b/print/lilypond-devel/pkg-plist
index dd46ff4a79a4..f212333f6474 100644
--- a/print/lilypond-devel/pkg-plist
+++ b/print/lilypond-devel/pkg-plist
@@ -310,7 +310,6 @@ share/emacs/site-lisp/lilypond-words.el
 %%DATADIR%%/%%DISTVERSION%%/scm/framework-null.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/framework-ps.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/framework-scm.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/framework-socket.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/framework-svg.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/fret-diagrams.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/graphviz.scm
@@ -329,7 +328,6 @@ share/emacs/site-lisp/lilypond-words.el
 %%DATADIR%%/%%DISTVERSION%%/scm/music-functions.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/output-lib.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/output-ps.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/output-socket.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/output-svg.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/page.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/paper-system.scm