Attachment #231701 for bug #261854

View | Details | Raw Unified | Return to bug 261854
Collapse All | Expand All




# Created by: patrick, trevor

PORTNAME=	lilypond
DISTVERSION=	2.23.6
CATEGORIES=	print audio
MASTER_SITES=	http://lilypond.org/download/source/v${DISTVERSION:R}/
PKGNAMESUFFIX=	-devel

			HOME=${WRKDIR} \
			YACC=${YACC}

CONFLICTS_INSTALL=	lilypond

MAKEFILE=	GNUmakefile
ALL_TARGET=	all

CONFLICTS_INSTALL=	lilypond

BINARY_ALIAS=	python=${PYTHON_VERSION}

INFO=		lilypond-changes \

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


Lines 1-3 Link Here

(-)b/print/lilypond-devel/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1638223494	1	TIMESTAMP = 1644228992
2	SHA256 (lilypond-2.23.5.tar.gz) = 53fd289eac318356003bf19b2d9e8ec43cb32e2ea926363145c1b26482bd1678	2	SHA256 (lilypond-2.23.6.tar.gz) = a179bd974a0e64390efef5bb0cc1e7287f1218237548433adba51c4f25bba2ce
3	SIZE (lilypond-2.23.5.tar.gz) = 17180401	3	SIZE (lilypond-2.23.6.tar.gz) = 17311135




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




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

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

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

Return to bug 261854

Lines 1-7 Link Here

(-)b/print/lilypond-devel/Makefile (-3 / +4 lines)
1	# Created by: patrick, trevor	1	# Created by: patrick, trevor
2		2
3	PORTNAME= lilypond	3	PORTNAME= lilypond
4	DISTVERSION= 2.23.5	4	DISTVERSION= 2.23.6
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 43-53 CONFIGURE_ENV+= ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \ Link Here
43	HOME=${WRKDIR} \	43	HOME=${WRKDIR} \
44	YACC=${YACC}	44	YACC=${YACC}
45		45
46	CONFLICTS_INSTALL= lilypond
47
48	MAKEFILE= GNUmakefile	46	MAKEFILE= GNUmakefile
49	ALL_TARGET= all	47	ALL_TARGET= all
50		48
		49	CONFLICTS_INSTALL= lilypond
		50
51	BINARY_ALIAS= python=${PYTHON_VERSION}	51	BINARY_ALIAS= python=${PYTHON_VERSION}
52		52
53	INFO= lilypond-changes \	53	INFO= lilypond-changes \
Lines 71-76 URW_DESC= Use bundled URW fonts Link Here
71	GUILE2_LIB_DEPENDS= libgc-threaded.so:devel/boehm-gc-threaded \	71	GUILE2_LIB_DEPENDS= libgc-threaded.so:devel/boehm-gc-threaded \
72	libguile-2.2.so:lang/guile2	72	libguile-2.2.so:lang/guile2
73	GUILE2_LIB_DEPENDS_OFF= libguile.so:lang/guile1	73	GUILE2_LIB_DEPENDS_OFF= libguile.so:lang/guile1
		74	GUILE2_CONFIGURE_ENV= GUILE_FLAVOR=guile-2.2
74		75
75	NLS_USES= gettext	76	NLS_USES= gettext
76		77

Removed Link Here

(-)a/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 111-116 share/emacs/site-lisp/lilypond-words.el Link Here

(-)b/print/lilypond-devel/pkg-plist (-1 / +2 lines)
111	%%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-rests.mf	111	%%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-rests.mf
112	%%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-scripts.mf	112	%%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-scripts.mf
113	%%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-sharps.mf	113	%%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-sharps.mf
		114	%%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-sori-koron.mf
114	%%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-ties.mf	115	%%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-ties.mf
115	%%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-timesignatures.mf	116	%%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-timesignatures.mf
116	%%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-trills.mf	117	%%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-trills.mf
Lines 188-194 share/emacs/site-lisp/lilypond-words.el Link Here
188	%%DATADIR%%/%%DISTVERSION%%/ly/event-listener.ly	189	%%DATADIR%%/%%DISTVERSION%%/ly/event-listener.ly
189	%%DATADIR%%/%%DISTVERSION%%/ly/festival.ly	190	%%DATADIR%%/%%DISTVERSION%%/ly/festival.ly
190	%%DATADIR%%/%%DISTVERSION%%/ly/generate-documentation.ly	191	%%DATADIR%%/%%DISTVERSION%%/ly/generate-documentation.ly
191	%%DATADIR%%/%%DISTVERSION%%/ly/generate-interface-doc-init.ly
192	%%DATADIR%%/%%DISTVERSION%%/ly/grace-init.ly	192	%%DATADIR%%/%%DISTVERSION%%/ly/grace-init.ly
193	%%DATADIR%%/%%DISTVERSION%%/ly/graphviz-init.ly	193	%%DATADIR%%/%%DISTVERSION%%/ly/graphviz-init.ly
194	%%DATADIR%%/%%DISTVERSION%%/ly/gregorian.ly	194	%%DATADIR%%/%%DISTVERSION%%/ly/gregorian.ly
Lines 205-210 share/emacs/site-lisp/lilypond-words.el Link Here
205	%%DATADIR%%/%%DISTVERSION%%/ly/norsk.ly	205	%%DATADIR%%/%%DISTVERSION%%/ly/norsk.ly
206	%%DATADIR%%/%%DISTVERSION%%/ly/paper-defaults-init.ly	206	%%DATADIR%%/%%DISTVERSION%%/ly/paper-defaults-init.ly
207	%%DATADIR%%/%%DISTVERSION%%/ly/performer-init.ly	207	%%DATADIR%%/%%DISTVERSION%%/ly/performer-init.ly
		208	%%DATADIR%%/%%DISTVERSION%%/ly/persian.ly
208	%%DATADIR%%/%%DISTVERSION%%/ly/piano-tkit.ly	209	%%DATADIR%%/%%DISTVERSION%%/ly/piano-tkit.ly
209	%%DATADIR%%/%%DISTVERSION%%/ly/portugues.ly	210	%%DATADIR%%/%%DISTVERSION%%/ly/portugues.ly
210	%%DATADIR%%/%%DISTVERSION%%/ly/predefined-fretboards-init.ly	211	%%DATADIR%%/%%DISTVERSION%%/ly/predefined-fretboards-init.ly