Attachment #226266 for bug #257016

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




# Created by: patrick, trevor

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

LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
		libfreetype.so:print/freetype2 \
		libgmp.so:math/gmp \
		libharfbuzz.so:print/harfbuzz \
		libltdl.so:devel/libltdl
RUN_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejavu \
		mftrace:print/mftrace

post-patch:
	@${REINPLACE_CMD} -e 's|<FlexLexer.h>|"/usr/include/FlexLexer.h"|' \
		${WRKSRC}/lily/include/includable-lexer.hh
	@${REINPLACE_CMD} -e 's|$save_CXXFLAGS -Werror=suggest-override|$save_CXXFLAGS|' \
		${WRKSRC}/configure
	@${SED} -e 's|%%FONTDIR%%|${WRKDIR}/fontconfig/cache/|'  \
		${FILESDIR}/fonts.conf > ${WRKDIR}/.fonts.conf


Lines 1-3 Link Here

(-)b/print/lilypond-devel/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1618420280	1	TIMESTAMP = 1625529967
2	SHA256 (lilypond-2.23.2.tar.gz) = 3b850b7af0322db720eafe8141f4a3e275fee6e00325da85decffbdb6ffced8c	2	SHA256 (lilypond-2.23.3.tar.gz) = 8a833696f7c6d2d4b4ae162ffd0836216c63c3765ea14069d6632d320d6bc308
3	SIZE (lilypond-2.23.2.tar.gz) = 17080861	3	SIZE (lilypond-2.23.3.tar.gz) = 17109789




--- Documentation/GNUmakefile.orig	2021-07-03 16:12:20 UTC
+++ Documentation/GNUmakefile
@@ -187,6 +187,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 `www`, but we
@@ -195,11 +196,9 @@ INFO_DOCS = \
 # older LilyPond versions inserted more entries that are no longer present.
 ALL_INFO_DOCS = \
   $(INFO_DOCS) \
-  lilypond-snippets \
   lilypond-web
 ifeq ($(out),www)
-  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)

Return to bug 257016

Lines 1-8 Link Here

(-)b/print/lilypond-devel/Makefile (-4 / +2 lines)
1	# Created by: patrick, trevor	1	# Created by: patrick, trevor
2		2
3	PORTNAME= lilypond	3	PORTNAME= lilypond
4	DISTVERSION= 2.23.2	4	DISTVERSION= 2.23.3
5	PORTREVISION= 1
6	CATEGORIES= print audio	5	CATEGORIES= print audio
7	MASTER_SITES= http://lilypond.org/download/source/v${DISTVERSION:R}/	6	MASTER_SITES= http://lilypond.org/download/source/v${DISTVERSION:R}/
8	PKGNAMESUFFIX= -devel	7	PKGNAMESUFFIX= -devel
Lines 26-31 BUILD_DEPENDS= bash:shells/bash \ Link Here
26	LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \	25	LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
27	libfreetype.so:print/freetype2 \	26	libfreetype.so:print/freetype2 \
28	libgmp.so:math/gmp \	27	libgmp.so:math/gmp \
		28	libharfbuzz.so:print/harfbuzz \
29	libltdl.so:devel/libltdl	29	libltdl.so:devel/libltdl
30	RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejavu \	30	RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejavu \
31	mftrace:print/mftrace	31	mftrace:print/mftrace
Lines 81-88 URW_CONFIGURE_WITH= urwotf-dir=${LOCALBASE}/share/fonts/urw-base35-fonts Link Here
81	post-patch:	81	post-patch:
82	@${REINPLACE_CMD} -e 's\|<FlexLexer.h>\|"/usr/include/FlexLexer.h"\|' \	82	@${REINPLACE_CMD} -e 's\|<FlexLexer.h>\|"/usr/include/FlexLexer.h"\|' \
83	${WRKSRC}/lily/include/includable-lexer.hh	83	${WRKSRC}/lily/include/includable-lexer.hh
84	@${REINPLACE_CMD} -e 's\|$save_CXXFLAGS -Werror=suggest-override\|$save_CXXFLAGS\|' \
85	${WRKSRC}/configure
86	@${SED} -e 's\|%%FONTDIR%%\|${WRKDIR}/fontconfig/cache/\|' \	84	@${SED} -e 's\|%%FONTDIR%%\|${WRKDIR}/fontconfig/cache/\|' \
87	${FILESDIR}/fonts.conf > ${WRKDIR}/.fonts.conf	85	${FILESDIR}/fonts.conf > ${WRKDIR}/.fonts.conf
88		86

Lines 1-23 Link Here

(-)b/print/lilypond-devel/files/patch-Documentation_GNUmakefile (-8 / +8 lines)
1	--- Documentation/GNUmakefile.orig 2020-08-16 10:58:56 UTC	1	--- Documentation/GNUmakefile.orig 2021-07-03 16:12:20 UTC
2	+++ Documentation/GNUmakefile	2	+++ Documentation/GNUmakefile
3	@@ -147,6 +147,7 @@ INFO_DOCS = \	3	@@ -187,6 +187,7 @@ INFO_DOCS = \
4	lilypond-internals \	4	lilypond-internals \
5	lilypond-learning \	5	lilypond-learning \
6	lilypond-notation \	6	lilypond-notation \
7	+ lilypond-snippets \	7	+ lilypond-snippets \
8	lilypond-usage \	8	lilypond-usage \
9	music-glossary	9	music-glossary
10	# Some info files should only be processed if `$(out)` is equal to	10	# Some info files should only be processed if `$(out)` is equal to `www`, but we
11	@@ -156,11 +157,9 @@ INFO_DOCS = \	11	@@ -195,11 +196,9 @@ INFO_DOCS = \
12	# more entries that are no longer present.	12	# older LilyPond versions inserted more entries that are no longer present.
13	ALL_INFO_DOCS = \	13	ALL_INFO_DOCS = \
14	$(INFO_DOCS) \	14	$(INFO_DOCS) \
15	- lilypond-snippets \	15	- lilypond-snippets \
16	lilypond-web	16	lilypond-web
17	ifeq ($(out),www)	17	ifeq ($(out),www)
18	-INFO_DOCS += lilypond-snippets \	18	- INFO_DOCS += lilypond-snippets \
19	- lilypond-web	19	- lilypond-web
20	+INFO_DOCS += lilypond-web	20	+ INFO_DOCS += lilypond-web
21	endif	21	endif
22	INFO_FILES = $(INFO_DOCS:%=$(outdir)/%.info)	22	INFO_FILES = $(INFO_DOCS:%=$(outdir)/%.info)
23	ALL_INFO_FILES = $(ALL_INFO_DOCS:%=$(outdir)/%.info)	23	ALL_INFO_FILES = $(ALL_INFO_DOCS:%=$(outdir)/%.info)