Attachment #230135 for bug #260294

Lines 1-7 Link Here

(-)b/print/lilypond-devel/Makefile (-1 / +1 lines)
1	# Created by: patrick, trevor	1	# Created by: patrick, trevor
2		2
3	PORTNAME= lilypond	3	PORTNAME= lilypond
4	DISTVERSION= 2.23.4	4	DISTVERSION= 2.23.5
5	CATEGORIES= print audio	5	CATEGORIES= print audio
6	MASTER_SITES= http://lilypond.org/download/source/v${DISTVERSION:R}/	6	MASTER_SITES= http://lilypond.org/download/source/v${DISTVERSION:R}/
7	PKGNAMESUFFIX= -devel	7	PKGNAMESUFFIX= -devel

Lines 1-3 Link Here

(-)b/print/lilypond-devel/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1635618361	1	TIMESTAMP = 1638223494
2	SHA256 (lilypond-2.23.4.tar.gz) = e300cfd7b94d81f1fb782ffee2aca8249002ece2f4868004274cebde32764b1e	2	SHA256 (lilypond-2.23.5.tar.gz) = 53fd289eac318356003bf19b2d9e8ec43cb32e2ea926363145c1b26482bd1678
3	SIZE (lilypond-2.23.4.tar.gz) = 17165846	3	SIZE (lilypond-2.23.5.tar.gz) = 17180401

Lines 1-6 Link Here

(-)b/print/lilypond-devel/files/patch-config.make.in (-2 / +2 lines)
1	--- config.make.in.orig 2020-08-16 10:58:56 UTC	1	--- config.make.in.orig 2021-11-28 13:46:28 UTC
2	+++ config.make.in	2	+++ config.make.in
3	@@ -94,7 +94,7 @@ mandir = @mandir@	3	@@ -95,7 +95,7 @@ mandir = @mandir@
4	package = lilypond	4	package = lilypond
5	package_datadir = $(datadir)/$(package)	5	package_datadir = $(datadir)/$(package)
6	package_docdir = $(docdir)/$(package)	6	package_docdir = $(docdir)/$(package)

Lines 1-6 Link Here

(-)b/print/lilypond-devel/files/patch-configure (-2 / +2 lines)
1	--- configure.orig 2020-07-13 14:02:44 UTC	1	--- configure.orig 2021-11-28 13:46:28 UTC
2	+++ configure	2	+++ configure
3	@@ -9035,71 +9035,10 @@ test -n "$PKG_CONFIG" \|\| PKG_CONFIG="no"	3	@@ -8623,71 +8623,10 @@ test -n "$PKG_CONFIG" \|\| PKG_CONFIG="no"
4	if test $? -eq 0; then	4	if test $? -eq 0; then
5	if test -n "0.9.0" -o -n ""; then	5	if test -n "0.9.0" -o -n ""; then
6		6




--- 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

Removed Link Here

(-)a/print/lilypond-devel/files/patch-lily_midi-item.cc (-11 lines)
1	--- lily/midi-item.cc.orig 2020-04-29 11:39:18 UTC
2	+++ lily/midi-item.cc
3	@@ -319,7 +319,7 @@ Midi_text::Midi_text (Audio_text *a)
4	string
5	Midi_text::to_string () const
6	{
7	- uint8_t text_code[] = {0xff, audio_->type_};
8	+ uint8_t text_code[] = {0xff, uint8_t (audio_->type_)};
9	string str ((char *) text_code, sizeof (text_code));
10	str += int2midi_varint_string (int (audio_->text_string_.length ()));
11	str += audio_->text_string_;

Lines 1-6 Link Here

(-)b/print/lilypond-devel/files/patch-stepmake_stepmake_texinfo-vars.make (-3 / +3 lines)
1	--- stepmake/stepmake/texinfo-vars.make.orig 2020-04-26 09:45:49 UTC	1	--- stepmake/stepmake/texinfo-vars.make.orig 2021-11-28 13:46:28 UTC
2	+++ stepmake/stepmake/texinfo-vars.make	2	+++ stepmake/stepmake/texinfo-vars.make
3	@@ -26,7 +26,7 @@ DO_TEXI_DEP = ( echo ./$@: $(call scan-texi,$<) > $(ba	3	@@ -3,7 +3,7 @@ TEXINFO_SOURCES = $(TEXI_FILES)
4		4
5	TEXINFO_PAPERSIZE_OPTION= $(if $(findstring $(PAPERSIZE),a4),,-t @afourpaper)	5	TEXINFO_PAPERSIZE_OPTION= $(if $(findstring $(PAPERSIZE),a4),,-t @afourpaper)
6		6
Lines 8-11 Link Here
8	+MAKEINFO_FLAGS += --enable-encoding --force $(DOCUMENTATION_INCLUDES)	8	+MAKEINFO_FLAGS += --enable-encoding --force $(DOCUMENTATION_INCLUDES)
9	MAKEINFO = LANG=C $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)	9	MAKEINFO = LANG=C $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
10		10
11	# texi2html xref map files	11	###########




%%DATADIR%%/%%DISTVERSION%%/scm/lily/document-markup.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/document-music.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/document-outside-staff-priorities.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/document-paper-sizes.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/document-translation.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/document-type-predicates.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/documentation-generate.scm

%%DATADIR%%/%%DISTVERSION%%/scm/lily/flag-styles.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/font.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/framework-cairo.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/framework-eps.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/framework-ps.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/framework-svg.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/fret-diagrams.scm

%%DATADIR%%/%%DISTVERSION%%/scm/lily/safe-lily.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/safe-utility-defs.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/scheme-engravers.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/scheme-performers.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/script.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/skyline.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/song-util.scm

Return to bug 260294

Added Link Here

(-)b/print/lilypond-devel/files/patch-lily_dispatcher.cc (+14 lines)
1	--- lily/dispatcher.cc.orig 2021-11-28 13:46:28 UTC
2	+++ lily/dispatcher.cc
3	@@ -23,8 +23,10 @@
4	#include "warn.hh"
5	#include "lily-imports.hh"
6
7	-#ifdef __MINGW32__
8	+#if defined __MINGW32__
9	#include <malloc.h>
10	+#elif defined __FreeBSD__
11	+#include <stdlib.h>
12	#else
13	#include <alloca.h>
14	#endif

Lines 296-301 share/emacs/site-lisp/lilypond-words.el Link Here

(-)b/print/lilypond-devel/pkg-plist (-1 / +2 lines)
296	%%DATADIR%%/%%DISTVERSION%%/scm/lily/document-markup.scm	296	%%DATADIR%%/%%DISTVERSION%%/scm/lily/document-markup.scm
297	%%DATADIR%%/%%DISTVERSION%%/scm/lily/document-music.scm	297	%%DATADIR%%/%%DISTVERSION%%/scm/lily/document-music.scm
298	%%DATADIR%%/%%DISTVERSION%%/scm/lily/document-outside-staff-priorities.scm	298	%%DATADIR%%/%%DISTVERSION%%/scm/lily/document-outside-staff-priorities.scm
		299	%%DATADIR%%/%%DISTVERSION%%/scm/lily/document-paper-sizes.scm
299	%%DATADIR%%/%%DISTVERSION%%/scm/lily/document-translation.scm	300	%%DATADIR%%/%%DISTVERSION%%/scm/lily/document-translation.scm
300	%%DATADIR%%/%%DISTVERSION%%/scm/lily/document-type-predicates.scm	301	%%DATADIR%%/%%DISTVERSION%%/scm/lily/document-type-predicates.scm
301	%%DATADIR%%/%%DISTVERSION%%/scm/lily/documentation-generate.scm	302	%%DATADIR%%/%%DISTVERSION%%/scm/lily/documentation-generate.scm
Lines 305-311 share/emacs/site-lisp/lilypond-words.el Link Here
305	%%DATADIR%%/%%DISTVERSION%%/scm/lily/flag-styles.scm	306	%%DATADIR%%/%%DISTVERSION%%/scm/lily/flag-styles.scm
306	%%DATADIR%%/%%DISTVERSION%%/scm/lily/font.scm	307	%%DATADIR%%/%%DISTVERSION%%/scm/lily/font.scm
307	%%DATADIR%%/%%DISTVERSION%%/scm/lily/framework-cairo.scm	308	%%DATADIR%%/%%DISTVERSION%%/scm/lily/framework-cairo.scm
308	%%DATADIR%%/%%DISTVERSION%%/scm/lily/framework-eps.scm
309	%%DATADIR%%/%%DISTVERSION%%/scm/lily/framework-ps.scm	309	%%DATADIR%%/%%DISTVERSION%%/scm/lily/framework-ps.scm
310	%%DATADIR%%/%%DISTVERSION%%/scm/lily/framework-svg.scm	310	%%DATADIR%%/%%DISTVERSION%%/scm/lily/framework-svg.scm
311	%%DATADIR%%/%%DISTVERSION%%/scm/lily/fret-diagrams.scm	311	%%DATADIR%%/%%DISTVERSION%%/scm/lily/fret-diagrams.scm
Lines 338-343 share/emacs/site-lisp/lilypond-words.el Link Here
338	%%DATADIR%%/%%DISTVERSION%%/scm/lily/safe-lily.scm	338	%%DATADIR%%/%%DISTVERSION%%/scm/lily/safe-lily.scm
339	%%DATADIR%%/%%DISTVERSION%%/scm/lily/safe-utility-defs.scm	339	%%DATADIR%%/%%DISTVERSION%%/scm/lily/safe-utility-defs.scm
340	%%DATADIR%%/%%DISTVERSION%%/scm/lily/scheme-engravers.scm	340	%%DATADIR%%/%%DISTVERSION%%/scm/lily/scheme-engravers.scm
		341	%%DATADIR%%/%%DISTVERSION%%/scm/lily/scheme-performers.scm
341	%%DATADIR%%/%%DISTVERSION%%/scm/lily/script.scm	342	%%DATADIR%%/%%DISTVERSION%%/scm/lily/script.scm
342	%%DATADIR%%/%%DISTVERSION%%/scm/lily/skyline.scm	343	%%DATADIR%%/%%DISTVERSION%%/scm/lily/skyline.scm
343	%%DATADIR%%/%%DISTVERSION%%/scm/lily/song-util.scm	344	%%DATADIR%%/%%DISTVERSION%%/scm/lily/song-util.scm