Attachment #234456 for bug #264465

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




# Created by: patrick, trevor

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

		zip:archivers/zip
LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
		libfreetype.so:print/freetype2 \
		libgc-threaded.so:devel/boehm-gc-threaded \
		libgmp.so:math/gmp \
		libguile-2.2.so:lang/guile2 \
		libharfbuzz.so:print/harfbuzz \
		libltdl.so:devel/libltdl
RUN_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejavu \
		mftrace:print/mftrace

USES=		bison:build compiler:c++11-lib cpe ghostscript gmake gnome \
		magick:7,build perl5 pkgconfig python:3.5+
USE_CXXSTD=	c++11
USE_GNOME=	pango
USE_PERL5=	build

CONFIGURE_ARGS+=	--with-texgyre-dir=${LOCALBASE}/${TEXMFDISTDIR}/fonts/opentype/public/tex-gyre
CONFIGURE_ENV+=		ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \
			FLEX=${FLEX} \
			GUILE_FLAVOR=guile-2.2 \
			HOME=${WRKDIR} \
			YACC=${YACC}


		music-glossary
PLIST_SUB=	DISTVERSION=${DISTVERSION}

OPTIONS_DEFINE=	NLS URW
OPTIONS_SUB=	yes

GUILE2_DESC=	Use guile2 (will incur some performance penalty)
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

URW_BUILD_DEPENDS=	urw-base35-fonts>0:x11-fonts/urw-base35-fonts
URW_RUN_DEPENDS_OFF=	urw-base35-fonts>0:x11-fonts/urw-base35-fonts

URW_CONFIGURE_WITH=	urwotf-dir=${LOCALBASE}/share/fonts/urw-base35-fonts

post-patch:

Lines 1-3 Link Here

(-)b/print/lilypond-devel/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1644228992	1	TIMESTAMP = 1653168738
2	SHA256 (lilypond-2.23.6.tar.gz) = a179bd974a0e64390efef5bb0cc1e7287f1218237548433adba51c4f25bba2ce	2	SHA256 (lilypond-2.23.9.tar.gz) = 11204fab661a5324f55c607dc8f9363a47afc741563f8dc867cdd60c173b27db
3	SIZE (lilypond-2.23.6.tar.gz) = 17311135	3	SIZE (lilypond-2.23.9.tar.gz) = 17490519

Lines 1-6 Link Here

(-)b/print/lilypond-devel/files/patch-Documentation_GNUmakefile (-3 / +3 lines)
1	--- Documentation/GNUmakefile.orig 2021-07-03 16:12:20 UTC	1	--- Documentation/GNUmakefile.orig 2022-03-26 15:12:51 UTC
2	+++ Documentation/GNUmakefile	2	+++ Documentation/GNUmakefile
3	@@ -187,6 +187,7 @@ INFO_DOCS = \	3	@@ -188,6 +188,7 @@ INFO_DOCS = \
4	lilypond-internals \	4	lilypond-internals \
5	lilypond-learning \	5	lilypond-learning \
6	lilypond-notation \	6	lilypond-notation \
Lines 8-14 Link Here
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 `www`, but we	10	# Some info files should only be processed if `$(out)` is equal to `www`, but we
11	@@ -195,11 +196,9 @@ INFO_DOCS = \	11	@@ -196,11 +197,9 @@ INFO_DOCS = \
12	# older LilyPond versions inserted 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) \




--- config.make.in.orig	2022-05-20 13:40:50 UTC
+++ config.make.in
@@ -99,7 +99,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@




--- configure.orig	2022-05-20 13:40:50 UTC
+++ configure
@@ -8770,71 +8770,10 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no"
     if test $? -eq 0; then
         if test -n "0.9.0" -o -n ""; then
 
-    r="`eval echo '$'"PKG_CONFIG"`"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking $r version" >&5
-printf %s "checking $r version... " >&6; }
-    exe=`
-    ## which doesn't work in ash, if /usr/bin/which isn't installed
-    ## type -p doesn't work in ash

-    }
-    {printf "%.0f\n", $1*1000000 + $2*1000 + three}'
-`
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ver" >&5
-printf "%s\n" "$ver" >&6; }
-    if test "$num" -lt "$min"; then
-
+    if test ! $?; then

Removed Link Here

(-)a/print/lilypond-devel/files/patch-stepmake_stepmake_texinfo-vars.make (-11 lines)
1	--- stepmake/stepmake/texinfo-vars.make.orig 2021-11-28 13:46:28 UTC
2	+++ stepmake/stepmake/texinfo-vars.make
3	@@ -3,7 +3,7 @@ TEXINFO_SOURCES = $(TEXI_FILES)
4
5	TEXINFO_PAPERSIZE_OPTION= $(if $(findstring $(PAPERSIZE),a4),,-t @afourpaper)
6
7	-MAKEINFO_FLAGS += --enable-encoding --error-limit=0 $(DOCUMENTATION_INCLUDES)
8	+MAKEINFO_FLAGS += --enable-encoding --force $(DOCUMENTATION_INCLUDES)
9	MAKEINFO = LANG=C $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
10
11	###########

Added Link Here

(-)b/print/lilypond-devel/files/patch-make_texinfo-vars.make (+11 lines)
1	--- make/texinfo-vars.make.orig 2022-05-20 13:40:50 UTC
2	+++ make/texinfo-vars.make
3	@@ -3,7 +3,7 @@ TEXINFO_SOURCES = $(TEXI_FILES)
4
5	TEXINFO_PAPERSIZE_OPTION= $(if $(findstring $(PAPERSIZE),a4),,-t @afourpaper)
6
7	-MAKEINFO_FLAGS += --enable-encoding --error-limit=0 $(DOCUMENTATION_INCLUDES)
8	+MAKEINFO_FLAGS += --enable-encoding --force $(DOCUMENTATION_INCLUDES)
9	MAKEINFO = LANG=C $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
10
11	###########

Return to bug 264465

Lines 1-7 Link Here

(-)b/print/lilypond-devel/Makefile (-11 / +7 lines)
1	# Created by: patrick, trevor	1	# Created by: patrick, trevor
2		2
3	PORTNAME= lilypond	3	PORTNAME= lilypond
4	DISTVERSION= 2.23.6	4	DISTVERSION= 2.23.9
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 23-36 BUILD_DEPENDS= bash:shells/bash \ Link Here
23	zip:archivers/zip	23	zip:archivers/zip
24	LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \	24	LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
25	libfreetype.so:print/freetype2 \	25	libfreetype.so:print/freetype2 \
		26	libgc-threaded.so:devel/boehm-gc-threaded \
26	libgmp.so:math/gmp \	27	libgmp.so:math/gmp \
		28	libguile-2.2.so:lang/guile2 \
27	libharfbuzz.so:print/harfbuzz \	29	libharfbuzz.so:print/harfbuzz \
28	libltdl.so:devel/libltdl	30	libltdl.so:devel/libltdl
29	RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejavu \	31	RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejavu \
30	mftrace:print/mftrace	32	mftrace:print/mftrace
31		33
32	USES= bison:build compiler:c++11-lib cpe ghostscript gmake gnome magick:7,build perl5 \	34	USES= bison:build compiler:c++11-lib cpe ghostscript gmake gnome \
33	pkgconfig python:3.5+	35	magick:7,build perl5 pkgconfig python:3.5+
34	USE_CXXSTD= c++11	36	USE_CXXSTD= c++11
35	USE_GNOME= pango	37	USE_GNOME= pango
36	USE_PERL5= build	38	USE_PERL5= build
Lines 40-45 GNU_CONFIGURE= yes Link Here
40	CONFIGURE_ARGS+= --with-texgyre-dir=${LOCALBASE}/${TEXMFDISTDIR}/fonts/opentype/public/tex-gyre	42	CONFIGURE_ARGS+= --with-texgyre-dir=${LOCALBASE}/${TEXMFDISTDIR}/fonts/opentype/public/tex-gyre
41	CONFIGURE_ENV+= ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \	43	CONFIGURE_ENV+= ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \
42	FLEX=${FLEX} \	44	FLEX=${FLEX} \
		45	GUILE_FLAVOR=guile-2.2 \
43	HOME=${WRKDIR} \	46	HOME=${WRKDIR} \
44	YACC=${YACC}	47	YACC=${YACC}
45		48
Lines 62-83 INFO= lilypond-changes \ Link Here
62	music-glossary	65	music-glossary
63	PLIST_SUB= DISTVERSION=${DISTVERSION}	66	PLIST_SUB= DISTVERSION=${DISTVERSION}
64		67
65	OPTIONS_DEFINE= GUILE2 NLS URW	68	OPTIONS_DEFINE= NLS URW
66	OPTIONS_SUB= yes	69	OPTIONS_SUB= yes
67		70
68	GUILE2_DESC= Use guile2 (will incur some performance penalty)
69	URW_DESC= Use bundled URW fonts	71	URW_DESC= Use bundled URW fonts
70		72
71	GUILE2_LIB_DEPENDS= libgc-threaded.so:devel/boehm-gc-threaded \
72	libguile-2.2.so:lang/guile2
73	GUILE2_LIB_DEPENDS_OFF= libguile.so:lang/guile1
74	GUILE2_CONFIGURE_ENV= GUILE_FLAVOR=guile-2.2
75
76	NLS_USES= gettext	73	NLS_USES= gettext
77		74
78	URW_BUILD_DEPENDS= urw-base35-fonts>0:x11-fonts/urw-base35-fonts	75	URW_BUILD_DEPENDS= urw-base35-fonts>0:x11-fonts/urw-base35-fonts
79	URW_RUN_DEPENDS_OFF= urw-base35-fonts>0:x11-fonts/urw-base35-fonts	76	URW_RUN_DEPENDS_OFF= urw-base35-fonts>0:x11-fonts/urw-base35-fonts
80
81	URW_CONFIGURE_WITH= urwotf-dir=${LOCALBASE}/share/fonts/urw-base35-fonts	77	URW_CONFIGURE_WITH= urwotf-dir=${LOCALBASE}/share/fonts/urw-base35-fonts
82		78
83	post-patch:	79	post-patch:

Lines 1-11 Link Here

(-)b/print/lilypond-devel/files/patch-config.make.in (-3 / +3 lines)
1	--- config.make.in.orig 2021-11-28 13:46:28 UTC	1	--- config.make.in.orig 2022-05-20 13:40:50 UTC
2	+++ config.make.in	2	+++ config.make.in
3	@@ -95,7 +95,7 @@ mandir = @mandir@	3	@@ -99,7 +99,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)
7	-package_infodir = $(infodir)/$(package)	7	-package_infodir = $(infodir)/$(package)
8	+package_infodir = $(infodir)	8	+package_infodir = $(infodir)
		9	package_libdir = $(libdir)/$(package)
9	prefix = @prefix@	10	prefix = @prefix@
10	program_prefix = @program_prefix@	11	program_prefix = @program_prefix@
11	program_suffix = @program_suffix@

Lines 1-12 Link Here

(-)b/print/lilypond-devel/files/patch-configure (-6 / +6 lines)
1	--- configure.orig 2021-11-28 13:46:28 UTC	1	--- configure.orig 2022-05-20 13:40:50 UTC
2	+++ configure	2	+++ configure
3	@@ -8623,71 +8623,10 @@ test -n "$PKG_CONFIG" \|\| PKG_CONFIG="no"	3	@@ -8770,71 +8770,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
7	- r="`eval echo '$'"PKG_CONFIG"`"	7	- r="`eval echo '$'"PKG_CONFIG"`"
8	- { $as_echo "$as_me:${as_lineno-$LINENO}: checking $r version" >&5	8	- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking $r version" >&5
9	-$as_echo_n "checking $r version... " >&6; }	9	-printf %s "checking $r version... " >&6; }
10	- exe=`	10	- exe=`
11	- ## which doesn't work in ash, if /usr/bin/which isn't installed	11	- ## which doesn't work in ash, if /usr/bin/which isn't installed
12	- ## type -p doesn't work in ash	12	- ## type -p doesn't work in ash
Lines 66-73 Link Here
66	- }	66	- }
67	- {printf "%.0f\n", $11000000 + $21000 + three}'	67	- {printf "%.0f\n", $11000000 + $21000 + three}'
68	-`	68	-`
69	- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ver" >&5	69	- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ver" >&5
70	-$as_echo "$ver" >&6; }	70	-printf "%s\n" "$ver" >&6; }
71	- if test "$num" -lt "$min"; then	71	- if test "$num" -lt "$min"; then
72	-	72	-
73	+ if test ! $?; then	73	+ if test ! $?; then

Lines 268-274 share/emacs/site-lisp/lilypond-words.el Link Here

(-)b/print/lilypond-devel/pkg-plist (-2 / +1 lines)
268	%%DATADIR%%/%%DISTVERSION%%/scm/lily/autochange.scm	268	%%DATADIR%%/%%DISTVERSION%%/scm/lily/autochange.scm
269	%%DATADIR%%/%%DISTVERSION%%/scm/lily/backend-library.scm	269	%%DATADIR%%/%%DISTVERSION%%/scm/lily/backend-library.scm
270	%%DATADIR%%/%%DISTVERSION%%/scm/lily/bar-line.scm	270	%%DATADIR%%/%%DISTVERSION%%/scm/lily/bar-line.scm
271	%%DATADIR%%/%%DISTVERSION%%/scm/lily/bezier-tools.scm	271	%%DATADIR%%/%%DISTVERSION%%/scm/lily/breath.scm
272	%%DATADIR%%/%%DISTVERSION%%/scm/lily/c++.scm	272	%%DATADIR%%/%%DISTVERSION%%/scm/lily/c++.scm
273	%%DATADIR%%/%%DISTVERSION%%/scm/lily/chord-entry.scm	273	%%DATADIR%%/%%DISTVERSION%%/scm/lily/chord-entry.scm
274	%%DATADIR%%/%%DISTVERSION%%/scm/lily/chord-ignatzek-names.scm	274	%%DATADIR%%/%%DISTVERSION%%/scm/lily/chord-ignatzek-names.scm
Lines 351-357 share/emacs/site-lisp/lilypond-words.el Link Here
351	%%DATADIR%%/%%DISTVERSION%%/scm/lily/titling.scm	351	%%DATADIR%%/%%DISTVERSION%%/scm/lily/titling.scm
352	%%DATADIR%%/%%DISTVERSION%%/scm/lily/to-xml.scm	352	%%DATADIR%%/%%DISTVERSION%%/scm/lily/to-xml.scm
353	%%DATADIR%%/%%DISTVERSION%%/scm/lily/translation-functions.scm	353	%%DATADIR%%/%%DISTVERSION%%/scm/lily/translation-functions.scm
354	%%DATADIR%%/%%DISTVERSION%%/tex/texinfo-ja.tex
355	%%DATADIR%%/%%DISTVERSION%%/vim/compiler/lilypond.vim	354	%%DATADIR%%/%%DISTVERSION%%/vim/compiler/lilypond.vim
356	%%DATADIR%%/%%DISTVERSION%%/vim/ftdetect/lilypond.vim	355	%%DATADIR%%/%%DISTVERSION%%/vim/ftdetect/lilypond.vim
357	%%DATADIR%%/%%DISTVERSION%%/vim/ftplugin/lilypond.vim	356	%%DATADIR%%/%%DISTVERSION%%/vim/ftplugin/lilypond.vim