print/lilypond-devel: 2.23.6

- Ensure using the chosen guile version once multiple versions can be
  installed concurrently

PR:		261854

4 files changed, 9 insertions, 21 deletions

diff --git a/print/lilypond-devel/Makefile b/print/lilypond-devel/Makefile
index 985860b04960..51a24002b235 100644
--- a/print/lilypond-devel/Makefile
+++ b/print/lilypond-devel/Makefile
@@ -1,7 +1,7 @@
 # Created by: patrick, trevor
 
 PORTNAME=	lilypond
-DISTVERSION=	2.23.5
+DISTVERSION=	2.23.6
 CATEGORIES=	print audio
 MASTER_SITES=	http://lilypond.org/download/source/v${DISTVERSION:R}/
 PKGNAMESUFFIX=	-devel
@@ -43,11 +43,11 @@ CONFIGURE_ENV+=		ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \
 			HOME=${WRKDIR} \
 			YACC=${YACC}
 
-CONFLICTS_INSTALL=	lilypond
-
 MAKEFILE=	GNUmakefile
 ALL_TARGET=	all
 
+CONFLICTS_INSTALL=	lilypond
+
 BINARY_ALIAS=	python=${PYTHON_VERSION}
 
 INFO=		lilypond-changes \
@@ -71,6 +71,7 @@ URW_DESC=	Use bundled URW fonts
 GUILE2_LIB_DEPENDS=	libgc-threaded.so:devel/boehm-gc-threaded \
 			libguile-2.2.so:lang/guile2
 GUILE2_LIB_DEPENDS_OFF=	libguile.so:lang/guile1
+GUILE2_CONFIGURE_ENV=	GUILE_FLAVOR=guile-2.2
 
 NLS_USES=	gettext
 
diff --git a/print/lilypond-devel/distinfo b/print/lilypond-devel/distinfo
index f59b892a2a4f..6d765fc48a7a 100644
--- a/print/lilypond-devel/distinfo
+++ b/print/lilypond-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1638223494
-SHA256 (lilypond-2.23.5.tar.gz) = 53fd289eac318356003bf19b2d9e8ec43cb32e2ea926363145c1b26482bd1678
-SIZE (lilypond-2.23.5.tar.gz) = 17180401
+TIMESTAMP = 1644228992
+SHA256 (lilypond-2.23.6.tar.gz) = a179bd974a0e64390efef5bb0cc1e7287f1218237548433adba51c4f25bba2ce
+SIZE (lilypond-2.23.6.tar.gz) = 17311135
diff --git a/print/lilypond-devel/files/patch-lily_dispatcher.cc b/print/lilypond-devel/files/patch-lily_dispatcher.cc
deleted file mode 100644
index e33d090c2f6e..000000000000
--- a/print/lilypond-devel/files/patch-lily_dispatcher.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- lily/dispatcher.cc.orig	2021-11-28 13:46:28 UTC
-+++ lily/dispatcher.cc
-@@ -23,8 +23,10 @@
- #include "warn.hh"
- #include "lily-imports.hh"
- 
--#ifdef __MINGW32__
-+#if defined __MINGW32__
- #include <malloc.h>
-+#elif defined __FreeBSD__
-+#include <stdlib.h>
- #else
- #include <alloca.h>
- #endif
diff --git a/print/lilypond-devel/pkg-plist b/print/lilypond-devel/pkg-plist
index f5b4f92a03ee..ea19211db351 100644
--- a/print/lilypond-devel/pkg-plist
+++ b/print/lilypond-devel/pkg-plist
@@ -111,6 +111,7 @@ share/emacs/site-lisp/lilypond-words.el
 %%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-rests.mf
 %%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-scripts.mf
 %%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-sharps.mf
+%%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-sori-koron.mf
 %%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-ties.mf
 %%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-timesignatures.mf
 %%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-trills.mf
@@ -188,7 +189,6 @@ share/emacs/site-lisp/lilypond-words.el
 %%DATADIR%%/%%DISTVERSION%%/ly/event-listener.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/festival.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/generate-documentation.ly
-%%DATADIR%%/%%DISTVERSION%%/ly/generate-interface-doc-init.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/grace-init.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/graphviz-init.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/gregorian.ly
@@ -205,6 +205,7 @@ share/emacs/site-lisp/lilypond-words.el
 %%DATADIR%%/%%DISTVERSION%%/ly/norsk.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/paper-defaults-init.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/performer-init.ly
+%%DATADIR%%/%%DISTVERSION%%/ly/persian.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/piano-tkit.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/portugues.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/predefined-fretboards-init.ly