Attachment #174444 for bug #212435

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

Lines 1-2 Link Here

(-)print/lilypond-devel/distinfo (-2 / +3 lines)
1	SHA256 (lilypond-2.19.11.tar.gz) = 5245aba230ccc0a217d25079eca44cea637c6897d99ff094f4145cacef70bbb0	1	TIMESTAMP = 1472857204
2	SIZE (lilypond-2.19.11.tar.gz) = 16304635	2	SHA256 (lilypond-2.19.47.tar.gz) = 842312813a9144b6b54a33f13fb19addbfc779d7bbfe3b2075be1235287de08c
		3	SIZE (lilypond-2.19.47.tar.gz) = 16926783

Lines 1-8 Link Here

(-)print/lilypond-devel/files/patch-config.make.in (-4 / +4 lines)
1	--- config.make.in.orig Sun Apr 11 10:26:32 2004	1	--- config.make.in.orig 2016-08-30 10:23:53 UTC
2	+++ config.make.in Sun Apr 11 10:26:46 2004	2	+++ config.make.in
3	@@ -41,7 +41,7 @@	3	@@ -67,7 +67,7 @@ sharedstatedir = @sharedstatedir@
		4	stepmake = @stepmake@
4		5
5	# move out of config.make.in?
6	package_datadir = $(datadir)/$(package)	6	package_datadir = $(datadir)/$(package)
7	-package_infodir = $(infodir)/$(package)	7	-package_infodir = $(infodir)/$(package)
8	+package_infodir = $(infodir)	8	+package_infodir = $(infodir)




--- configure.orig	2016-08-30 10:23:53 UTC
+++ configure
@@ -11412,74 +11412,7 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no"
 
     if test $? -eq 0 -a -n "0.9.0"; then
 
-    r="`eval echo '$'"PKG_CONFIG"`"
-    { $as_echo "$as_me:$LINENO: checking $r version" >&5
-$as_echo_n "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
-    ## command -v doesn't work in zsh
-    ## command -v "$r" 2>&1
-    ## this test should work in ash, bash, pdksh (ksh), zsh
-    type -p $r 2>/dev/null | tail -n 1 | awk '{print $NF}'
-`
-    if test -n ""; then
-        ver=""
-    else
-        ver=`
-    ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}'
-    ##
-    ## ARG.
-    ## Workaround for broken Debian gcc version string:
-    ##     gcc (GCC) 3.1.1 20020606 (Debian prerelease)
-    ##
-    ## -V: Workaround for python
-
-    #dnl
-
-    ## Assume and hunt for dotted version multiplet.
-    ## use eval trickery, because we cannot use multi-level $() instead of ``
-    ## for compatibility reasons.
-
-    ## grab the first version number in  --version output.
-    eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 |
-		grep -E '(^| )[0-9][0-9]*\.[0-9]' |
-		head -n 1 |
-		tr ' ' '\n' |
-		sed 's/\([0-9][0-9]*\.[0-9][0-9.]*\).*/\1/g' |
-		grep -E '(^| )[0-9][0-9]*\.[0-9]' |
-		head -n 1\`\"
-
-    if test -z "$_ver"; then
-        ## If empty, try date [fontforge]
-        eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \
-	    | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \
-	    | head -n 1 \
-	    | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\"
-    fi
-    echo "$_ver"
-    #dnl
-`
-    fi
-    num=`
-    echo "$ver" | awk -F. '
-    {
-      if ($3) {three = $3}
-      else {three = 0}
-    }
-    {printf "%.0f\n", $1*1000000 + $2*1000 + three}'
-`
-    req=`
-    echo "0.9.0" | awk -F. '
-    {
-      if ($3) {three = $3}
-      else {three = 0}
-    }
-    {printf "%.0f\n", $1*1000000 + $2*1000 + three}'
-`
-    { $as_echo "$as_me:$LINENO: result: $ver" >&5
-$as_echo "$ver" >&6; }
-    if test "$num" -lt "$req"; then
+    if $exe --atleast-pkgconfig-version 0.9.0; then
 
     eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 0.9.0 (installed: $ver)"\"`\"
 

Lines 1-6 Link Here

(-)print/lilypond-devel/files/patch-Documentation_GNUmakefile (-3 / +3 lines)
1	--- Documentation/GNUmakefile.orig 2012-08-28 14:06:34.000000000 +0200	1	--- Documentation/GNUmakefile.orig 2016-08-30 10:23:53 UTC
2	+++ Documentation/GNUmakefile 2012-08-28 14:06:18.000000000 +0200	2	+++ Documentation/GNUmakefile
3	@@ -77,9 +77,9 @@	3	@@ -73,9 +73,9 @@ source-links = $(outdir)/source\
4	MAIN_INFO_DOC = lilypond-web	4	MAIN_INFO_DOC = lilypond-web
5	INFO_DOCS = lilypond-usage lilypond-changes lilypond-contributor lilypond-internals \	5	INFO_DOCS = lilypond-usage lilypond-changes lilypond-contributor lilypond-internals \
6	lilypond-essay lilypond-learning lilypond-notation music-glossary \	6	lilypond-essay lilypond-learning lilypond-notation music-glossary \




--- flower/include/std-string.hh.orig	2016-08-30 10:23:53 UTC
+++ flower/include/std-string.hh
@@ -38,6 +38,7 @@ using namespace std;
 typedef size_t ssize;
 #define NPOS string::npos
 
+#if _cplusplus <= 19971L
 string to_string (const string&);
 string to_string (char c, int n = 1);
 string to_string (int i, char const *format = 0);
@@ -49,6 +50,7 @@ string to_string (unsigned);
 string to_string (bool b);
 string to_string (char const *format, ...)
 __attribute__ ((format (printf, 1, 2)));
+#endif
 
 string &replace_all (string *str, string const &find, string const &replace);
 string &replace_all (string *str, char find, char replace);

Line 0 Link Here

(-)print/lilypond-devel/files/patch-flower_include_std-vector.hh (+10 lines)
	1	--- flower/include/std-vector.hh.orig 2016-08-30 10:23:53 UTC
	2	+++ flower/include/std-vector.hh
	3	@@ -212,6 +212,6 @@ junk_pointers (vector<T> &v)
	4	vector<string> string_split (string str, char c);
	5	string string_join (vector<string> const &strs, const string &infix);
	6
	7	-#define iterof(i,s) typeof((s).begin()) i((s).begin())
	8	+#define iterof(i,s) auto i = ((s).begin())
	9
	10	#endif /* STD_VECTOR_HH */




--- flower/include/std-string.hh.orig	2014-04-07 10:27:23.000000000 +0200
+++ flower/include/std-string.hh	2014-04-07 10:27:33.000000000 +0200
@@ -39,6 +39,7 @@
 typedef size_t ssize;
 #define NPOS string::npos
 
+#if _cplusplus <= 19971L
 string to_string (const string&);
 string to_string (char c, int n = 1);
 string to_string (int i, char const *format = 0);
@@ -50,6 +51,7 @@
 string to_string (bool b);
 string to_string (char const *format, ...)
 __attribute__ ((format (printf, 1, 2)));
+#endif
 
 string &replace_all (string *str, string const &find, string const &replace);
 string &replace_all (string *str, char find, char replace);

Lines 1-10 Link Here

(-)print/lilypond-devel/files/patch-flower-include_std-vector.hh (-10 lines)
1	--- flower/include/std-vector.hh.orig 2014-05-05 10:25:02.000000000 +0200
2	+++ flower/include/std-vector.hh 2014-05-05 10:28:54.000000000 +0200
3	@@ -261,6 +261,6 @@
4	vector<string> string_split (string str, char c);
5	string string_join (vector<string> const &strs, const string &infix);
6
7	-#define iterof(i,s) typeof((s).begin()) i((s).begin())
8	+#define iterof(i,s) auto i = ((s).begin())
9
10	#endif /* STD_VECTOR_HH */

Line 0 Link Here

(-)print/lilypond-devel/files/patch-lily_include_lily-guile.hh (+11 lines)
	1	--- lily/include/lily-guile.hh.orig 2016-08-30 10:23:53 UTC
	2	+++ lily/include/lily-guile.hh
	3	@@ -20,6 +20,8 @@
	4	#ifndef LILY_GUILE_HH
	5	#define LILY_GUILE_HH
	6
	7	+#include <cstddef>
	8	+
	9	#if __MINGW32__
	10	#include "mingw-compatibility.hh"
	11	#endif

Lines 1-8 Link Here

(-)print/lilypond-devel/files/patch-stepmake_stepmake_texinfo-vars.make (-4 / +4 lines)
1	--- stepmake/stepmake/texinfo-vars.make.orig 2013-02-23 09:14:13.000000000 -0700	1	--- stepmake/stepmake/texinfo-vars.make.orig 2016-08-30 10:23:53 UTC
2	+++ stepmake/stepmake/texinfo-vars.make 2013-03-08 12:16:51.000000000 -0700	2	+++ stepmake/stepmake/texinfo-vars.make
3	@@ -33,7 +33,7 @@	3	@@ -31,7 +31,7 @@ DO_TEXI_DEP = ( echo ./$@: $(call scan-t
4		4
5	DOCUMENTATION_INCLUDES += -I $(top-src-dir)/Documentation	5	TEXINFO_PAPERSIZE_OPTION= $(if $(findstring $(PAPERSIZE),a4),,-t @afourpaper)
6		6
7	-MAKEINFO_FLAGS += --enable-encoding --error-limit=0 $(DOCUMENTATION_INCLUDES)	7	-MAKEINFO_FLAGS += --enable-encoding --error-limit=0 $(DOCUMENTATION_INCLUDES)
8	+MAKEINFO_FLAGS += --enable-encoding --force $(DOCUMENTATION_INCLUDES)	8	+MAKEINFO_FLAGS += --enable-encoding --force $(DOCUMENTATION_INCLUDES)




# Created by: patrick, trevor
# $FreeBSD: head/print/lilypond-devel/Makefile 419252 2016-07-29 13:20:17Z marino $

PORTNAME=	lilypond
PORTVERSION=	2.19.47
PORTREVISION=	5
CATEGORIES=	print audio
MASTER_SITES=	http://download.linuxaudio.org/lilypond/sources/v${PORTVERSION:R}/
PKGNAMESUFFIX=	-devel

MAINTAINER=	m.ne@gmx.net
COMMENT=	GNU music typesetter

LICENSE=	GPLv3

		pngtopnm:graphics/netpbm \
		rsync:net/rsync \
		texi2html:textproc/texi2html \
		zip:archivers/zip
		${LOCALBASE}/share/ghostscript/fonts/c059033l.pfb:print/gsfonts
RUN_DEPENDS=	mftrace:print/mftrace \
		${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejavu
LIB_DEPENDS=	libguile.so:lang/guile \

		libfreetype.so:print/freetype2

BROKEN_FreeBSD_9=	does not build on FreeBSD < 10.x
BROKEN=		pkgconf detection is broken
DEPRECATED=	unstable branch requires maintainer, many releases behind already (stick with stable)
EXPIRATION_DATE=	2016-08-31

INFO=		internals \
		lilypond-changes \

		music-glossary

USES=		bison:build gettext ghostscript gmake pkgconfig perl5 \
		compiler:gcc-c++11-lib python:-3
USE_CXXSTD=	c++11
USE_TEX=	latex texmf
USE_PERL5=	build
USE_GNOME=	pango


MAKE_JOBS_UNSAFE=	yes

GNU_CONFIGURE=	yes
CONFIGURE_ARGS+=--with-texgyre-dir=${LOCALBASE}/${TEXMFDISTDIR}/fonts/opentype/public/tex-gyre \
		--with-python-include=${PYTHON_INCLUDEDIR}
CONFIGURE_ENV+=	ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \
		FLEX=${FLEX} YACC=${YACC} HOME=${WRKDIR}




bin/lilypond-book
bin/lilypond-invoke-editor
bin/lilypond
bin/lilysong
bin/lilymidi
bin/musicxml2ly
bin/abc2ly
bin/convert-ly
bin/etf2ly
bin/lilymidi
bin/lilypond
bin/lilypond-book
bin/lilypond-invoke-editor
bin/lilysong
bin/midi2ly
bin/musicxml2ly
lib/lilypond/%%PORTVERSION%%/python/midi.so
man/man1/abc2ly.1.gz
man/man1/convert-ly.1.gz
man/man1/etf2ly.1.gz
man/man1/lilymidi.1.gz
man/man1/lilypond-book.1.gz
man/man1/lilypond-invoke-editor.1.gz
man/man1/lilypond.1.gz
man/man1/lilysong.1.gz
man/man1/convert-ly.1.gz
man/man1/abc2ly.1.gz
man/man1/etf2ly.1.gz
man/man1/midi2ly.1.gz
man/man1/musicxml2ly.1.gz
share/emacs/site-lisp/lilypond-font-lock.el
share/emacs/site-lisp/lilypond-indent.el
share/emacs/site-lisp/lilypond-init.el
share/emacs/site-lisp/lilypond-mode.el
share/emacs/site-lisp/lilypond-song.el
share/emacs/site-lisp/lilypond-what-beat.el
share/emacs/site-lisp/lilypond-words.el
%%DATADIR%%/%%PORTVERSION%%/fonts/00-lilypond-fonts.conf
%%DATADIR%%/%%PORTVERSION%%/fonts/99-lilypond-fonts.conf
%%DATADIR%%/%%PORTVERSION%%/fonts/otf/emmentaler-11.otf
%%DATADIR%%/%%PORTVERSION%%/fonts/otf/emmentaler-13.otf
%%DATADIR%%/%%PORTVERSION%%/fonts/otf/emmentaler-14.otf

%%DATADIR%%/%%PORTVERSION%%/fonts/otf/emmentaler-23.otf
%%DATADIR%%/%%PORTVERSION%%/fonts/otf/emmentaler-26.otf
%%DATADIR%%/%%PORTVERSION%%/fonts/otf/emmentaler-brace.otf
%%DATADIR%%/%%PORTVERSION%%/fonts/otf/texgyrecursor-bold.otf
%%DATADIR%%/%%PORTVERSION%%/fonts/otf/texgyrecursor-bolditalic.otf
%%DATADIR%%/%%PORTVERSION%%/fonts/otf/texgyrecursor-italic.otf
%%DATADIR%%/%%PORTVERSION%%/fonts/otf/texgyrecursor-regular.otf
%%DATADIR%%/%%PORTVERSION%%/fonts/otf/texgyreheros-bold.otf
%%DATADIR%%/%%PORTVERSION%%/fonts/otf/texgyreheros-bolditalic.otf
%%DATADIR%%/%%PORTVERSION%%/fonts/otf/texgyreheros-italic.otf
%%DATADIR%%/%%PORTVERSION%%/fonts/otf/texgyreheros-regular.otf
%%DATADIR%%/%%PORTVERSION%%/fonts/otf/texgyreschola-bold.otf
%%DATADIR%%/%%PORTVERSION%%/fonts/otf/texgyreschola-bolditalic.otf
%%DATADIR%%/%%PORTVERSION%%/fonts/otf/texgyreschola-italic.otf
%%DATADIR%%/%%PORTVERSION%%/fonts/otf/texgyreschola-regular.otf
%%DATADIR%%/%%PORTVERSION%%/fonts/source/common-modules-and-initialization.mf
%%DATADIR%%/%%PORTVERSION%%/fonts/source/debugging-settings.mf
%%DATADIR%%/%%PORTVERSION%%/fonts/source/declare-autometric-parameters.mf

%%DATADIR%%/%%PORTVERSION%%/ly/arabic.ly
%%DATADIR%%/%%PORTVERSION%%/ly/articulate.ly
%%DATADIR%%/%%PORTVERSION%%/ly/bagpipe.ly
%%DATADIR%%/%%PORTVERSION%%/ly/base-tkit.ly
%%DATADIR%%/%%PORTVERSION%%/ly/catalan.ly
%%DATADIR%%/%%PORTVERSION%%/ly/chord-modifiers-init.ly
%%DATADIR%%/%%PORTVERSION%%/ly/chord-repetition-init.ly

%%DATADIR%%/%%PORTVERSION%%/ly/init.ly
%%DATADIR%%/%%PORTVERSION%%/ly/italiano.ly
%%DATADIR%%/%%PORTVERSION%%/ly/lilypond-book-preamble.ly
%%DATADIR%%/%%PORTVERSION%%/ly/lyrics-tkit.ly
%%DATADIR%%/%%PORTVERSION%%/ly/makam.ly
%%DATADIR%%/%%PORTVERSION%%/ly/midi-init.ly
%%DATADIR%%/%%PORTVERSION%%/ly/music-functions-init.ly

%%DATADIR%%/%%PORTVERSION%%/ly/norsk.ly
%%DATADIR%%/%%PORTVERSION%%/ly/paper-defaults-init.ly
%%DATADIR%%/%%PORTVERSION%%/ly/performer-init.ly
%%DATADIR%%/%%PORTVERSION%%/ly/piano-tkit.ly
%%DATADIR%%/%%PORTVERSION%%/ly/portugues.ly
%%DATADIR%%/%%PORTVERSION%%/ly/predefined-fretboards-init.ly
%%DATADIR%%/%%PORTVERSION%%/ly/predefined-guitar-fretboards.ly

%%DATADIR%%/%%PORTVERSION%%/ly/scheme-sandbox.ly
%%DATADIR%%/%%PORTVERSION%%/ly/script-init.ly
%%DATADIR%%/%%PORTVERSION%%/ly/spanners-init.ly
%%DATADIR%%/%%PORTVERSION%%/ly/ssaattbb.ly
%%DATADIR%%/%%PORTVERSION%%/ly/staff-tkit.ly
%%DATADIR%%/%%PORTVERSION%%/ly/string-tunings-init.ly
%%DATADIR%%/%%PORTVERSION%%/ly/suomi.ly
%%DATADIR%%/%%PORTVERSION%%/ly/svenska.ly

%%DATADIR%%/%%PORTVERSION%%/ly/titling-init.ly
%%DATADIR%%/%%PORTVERSION%%/ly/toc-init.ly
%%DATADIR%%/%%PORTVERSION%%/ly/vlaams.ly
%%DATADIR%%/%%PORTVERSION%%/ly/vocal-tkit.ly
%%DATADIR%%/%%PORTVERSION%%/ly/voice-tkit.ly
%%DATADIR%%/%%PORTVERSION%%/ps/encodingdefs.ps
%%DATADIR%%/%%PORTVERSION%%/ps/lilyponddefs.ps
%%DATADIR%%/%%PORTVERSION%%/ps/music-drawing-routines.ps
%%DATADIR%%/%%PORTVERSION%%/python/book_base.py

%%DATADIR%%/%%PORTVERSION%%/python/musicexp.pyc
%%DATADIR%%/%%PORTVERSION%%/python/musicxml.py
%%DATADIR%%/%%PORTVERSION%%/python/musicxml.pyc
%%DATADIR%%/%%PORTVERSION%%/python/musicxml2ly_conversion.py
%%DATADIR%%/%%PORTVERSION%%/python/musicxml2ly_conversion.pyc
%%DATADIR%%/%%PORTVERSION%%/python/rational.py
%%DATADIR%%/%%PORTVERSION%%/python/rational.pyc
%%DATADIR%%/%%PORTVERSION%%/python/safeeval.py
%%DATADIR%%/%%PORTVERSION%%/python/safeeval.pyc
%%DATADIR%%/%%PORTVERSION%%/python/utilities.py
%%DATADIR%%/%%PORTVERSION%%/python/utilities.pyc
%%DATADIR%%/%%PORTVERSION%%/scm/accreg.scm
%%DATADIR%%/%%PORTVERSION%%/scm/auto-beam.scm
%%DATADIR%%/%%PORTVERSION%%/scm/autochange.scm

%%DATADIR%%/%%PORTVERSION%%/scm/tablature.scm
%%DATADIR%%/%%PORTVERSION%%/scm/text.scm
%%DATADIR%%/%%PORTVERSION%%/scm/time-signature-settings.scm
%%DATADIR%%/%%PORTVERSION%%/scm/time-signature.scm
%%DATADIR%%/%%PORTVERSION%%/scm/titling.scm
%%DATADIR%%/%%PORTVERSION%%/scm/to-xml.scm
%%DATADIR%%/%%PORTVERSION%%/scm/translation-functions.scm

%%DATADIR%%/%%PORTVERSION%%/vim/syntax/lilypond-words.vim
%%DATADIR%%/%%PORTVERSION%%/vim/syntax/lilypond.vim
%%DATADIR%%/current
share/emacs/site-lisp/lilypond-font-lock.el
share/emacs/site-lisp/lilypond-indent.el
share/emacs/site-lisp/lilypond-init.el
share/emacs/site-lisp/lilypond-mode.el
share/emacs/site-lisp/lilypond-song.el
share/emacs/site-lisp/lilypond-what-beat.el
share/emacs/site-lisp/lilypond-words.el
%%NLS%%share/locale/ca/LC_MESSAGES/lilypond.mo
%%NLS%%share/locale/cs/LC_MESSAGES/lilypond.mo
%%NLS%%share/locale/da/LC_MESSAGES/lilypond.mo

Return to bug 212435

Line 0 Link Here

(-)print/lilypond-devel/files/patch-configure (+78 lines)
		1	--- configure.orig 2016-08-30 10:23:53 UTC
		2	+++ configure
		3	@@ -11412,74 +11412,7 @@ test -n "$PKG_CONFIG" \|\| PKG_CONFIG="no"
		4
		5	if test $? -eq 0 -a -n "0.9.0"; then
		6
		7	- r="`eval echo '$'"PKG_CONFIG"`"
		8	- { $as_echo "$as_me:$LINENO: checking $r version" >&5
		9	-$as_echo_n "checking $r version... " >&6; }
		10	- exe=`
		11	- ## which doesn't work in ash, if /usr/bin/which isn't installed
		12	- ## type -p doesn't work in ash
		13	- ## command -v doesn't work in zsh
		14	- ## command -v "$r" 2>&1
		15	- ## this test should work in ash, bash, pdksh (ksh), zsh
		16	- type -p $r 2>/dev/null \| tail -n 1 \| awk '{print $NF}'
		17	-`
		18	- if test -n ""; then
		19	- ver=""
		20	- else
		21	- ver=`
		22	- ## "$exe" --version 2>&1 \| grep -v '^$' \| head -n 1 \| awk '{print $NF}'
		23	- ##
		24	- ## ARG.
		25	- ## Workaround for broken Debian gcc version string:
		26	- ## gcc (GCC) 3.1.1 20020606 (Debian prerelease)
		27	- ##
		28	- ## -V: Workaround for python
		29	-
		30	- #dnl
		31	-
		32	- ## Assume and hunt for dotted version multiplet.
		33	- ## use eval trickery, because we cannot use multi-level $() instead of ``
		34	- ## for compatibility reasons.
		35	-
		36	- ## grab the first version number in --version output.
		37	- eval _ver=\"\`("$exe" --version \|\| "$exe" -V) 2>&1 \|
		38	- grep -E '(^\| )[0-9][0-9]*\.[0-9]' \|
		39	- head -n 1 \|
		40	- tr ' ' '\n' \|
		41	- sed 's/\([0-9][0-9]\.[0-9][0-9.]\).*/\1/g' \|
		42	- grep -E '(^\| )[0-9][0-9]*\.[0-9]' \|
		43	- head -n 1\`\"
		44	-
		45	- if test -z "$_ver"; then
		46	- ## If empty, try date [fontforge]
		47	- eval _ver=\"\`("$exe" --version \|\| "$exe" -V) 2>&1 \
		48	- \| grep '\(^\\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\\|$\)' \
		49	- \| head -n 1 \
		50	- \| sed -e 's/^[^.0-9]//' -e 's/[^.0-9]$//'\`\"
		51	- fi
		52	- echo "$_ver"
		53	- #dnl
		54	-`
		55	- fi
		56	- num=`
		57	- echo "$ver" \| awk -F. '
		58	- {
		59	- if ($3) {three = $3}
		60	- else {three = 0}
		61	- }
		62	- {printf "%.0f\n", $11000000 + $21000 + three}'
		63	-`
		64	- req=`
65	- echo "0.9.0" \| awk -F. '
66	- {
67	- if ($3) {three = $3}
68	- else {three = 0}
69	- }
70	- {printf "%.0f\n", $11000000 + $21000 + three}'
71	-`
72	- { $as_echo "$as_me:$LINENO: result: $ver" >&5
73	-$as_echo "$ver" >&6; }
74	- if test "$num" -lt "$req"; then
75	+ if $exe --atleast-pkgconfig-version 0.9.0; then
76
77	eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 0.9.0 (installed: $ver)"\"`\"
78

Line 0 Link Here

(-)print/lilypond-devel/files/patch-flower_include_std-string.hh (+18 lines)
	1	--- flower/include/std-string.hh.orig 2016-08-30 10:23:53 UTC
	2	+++ flower/include/std-string.hh
	3	@@ -38,6 +38,7 @@ using namespace std;
	4	typedef size_t ssize;
	5	#define NPOS string::npos
	6
	7	+#if _cplusplus <= 19971L
	8	string to_string (const string&);
	9	string to_string (char c, int n = 1);
	10	string to_string (int i, char const *format = 0);
	11	@@ -49,6 +50,7 @@ string to_string (unsigned);
	12	string to_string (bool b);
	13	string to_string (char const *format, ...)
	14	__attribute__ ((format (printf, 1, 2)));
	15	+#endif
	16
	17	string &replace_all (string *str, string const &find, string const &replace);
	18	string &replace_all (string *str, char find, char replace);

Lines 1-18 Link Here

(-)print/lilypond-devel/files/patch-flower-include_std-string.hh (-18 lines)
1	--- flower/include/std-string.hh.orig 2014-04-07 10:27:23.000000000 +0200
2	+++ flower/include/std-string.hh 2014-04-07 10:27:33.000000000 +0200
3	@@ -39,6 +39,7 @@
4	typedef size_t ssize;
5	#define NPOS string::npos
6
7	+#if _cplusplus <= 19971L
8	string to_string (const string&);
9	string to_string (char c, int n = 1);
10	string to_string (int i, char const *format = 0);
11	@@ -50,6 +51,7 @@
12	string to_string (bool b);
13	string to_string (char const *format, ...)
14	__attribute__ ((format (printf, 1, 2)));
15	+#endif
16
17	string &replace_all (string *str, string const &find, string const &replace);
18	string &replace_all (string *str, char find, char replace);

Lines 1-14 Link Here

(-)print/lilypond-devel/Makefile (-12 / +7 lines)
1	# Created by: patrick, trevor	1	# Created by: patrick, trevor
2	# $FreeBSD$	2	# $FreeBSD: head/print/lilypond-devel/Makefile 419252 2016-07-29 13:20:17Z marino $
3		3
4	PORTNAME= lilypond	4	PORTNAME= lilypond
5	PORTVERSION= 2.19.11	5	PORTVERSION= 2.19.47
6	PORTREVISION= 5
7	CATEGORIES= print audio	6	CATEGORIES= print audio
8	MASTER_SITES= http://download.linuxaudio.org/lilypond/sources/v${PORTVERSION:R}/	7	MASTER_SITES= http://download.linuxaudio.org/lilypond/sources/v${PORTVERSION:R}/
9	PKGNAMESUFFIX= -devel	8	PKGNAMESUFFIX= -devel
10		9
11	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= m.ne@gmx.net
12	COMMENT= GNU music typesetter	11	COMMENT= GNU music typesetter
13		12
14	LICENSE= GPLv3	13	LICENSE= GPLv3
Lines 23-30 Link Here
23	pngtopnm:graphics/netpbm \	22	pngtopnm:graphics/netpbm \
24	rsync:net/rsync \	23	rsync:net/rsync \
25	texi2html:textproc/texi2html \	24	texi2html:textproc/texi2html \
26	zip:archivers/zip \	25	zip:archivers/zip
27	${LOCALBASE}/share/ghostscript/fonts/c059033l.pfb:print/gsfonts
28	RUN_DEPENDS= mftrace:print/mftrace \	26	RUN_DEPENDS= mftrace:print/mftrace \
29	${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejavu	27	${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejavu
30	LIB_DEPENDS= libguile.so:lang/guile \	28	LIB_DEPENDS= libguile.so:lang/guile \
Lines 32-40 Link Here
32	libfreetype.so:print/freetype2	30	libfreetype.so:print/freetype2
33		31
34	BROKEN_FreeBSD_9= does not build on FreeBSD < 10.x	32	BROKEN_FreeBSD_9= does not build on FreeBSD < 10.x
35	BROKEN= pkgconf detection is broken
36	DEPRECATED= unstable branch requires maintainer, many releases behind already (stick with stable)
37	EXPIRATION_DATE= 2016-08-31
38		33
39	INFO= internals \	34	INFO= internals \
40	lilypond-changes \	35	lilypond-changes \
Lines 50-58 Link Here
50	music-glossary	45	music-glossary
51		46
52	USES= bison:build gettext ghostscript gmake pkgconfig perl5 \	47	USES= bison:build gettext ghostscript gmake pkgconfig perl5 \
53	compiler:c++11-lib python:-3	48	compiler:gcc-c++11-lib python:-3
54	USE_CXXSTD= c++11	49	USE_CXXSTD= c++11
55	USE_TEX= latex	50	USE_TEX= latex texmf
56	USE_PERL5= build	51	USE_PERL5= build
57	USE_GNOME= pango	52	USE_GNOME= pango
58		53
Lines 61-67 Link Here
61	MAKE_JOBS_UNSAFE= yes	56	MAKE_JOBS_UNSAFE= yes
62		57
63	GNU_CONFIGURE= yes	58	GNU_CONFIGURE= yes
64	CONFIGURE_ARGS+=--with-ncsb-dir=${LOCALBASE}/share/ghostscript/fonts \	59	CONFIGURE_ARGS+=--with-texgyre-dir=${LOCALBASE}/${TEXMFDISTDIR}/fonts/opentype/public/tex-gyre \
65	--with-python-include=${PYTHON_INCLUDEDIR}	60	--with-python-include=${PYTHON_INCLUDEDIR}
66	CONFIGURE_ENV+= ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \	61	CONFIGURE_ENV+= ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \
67	FLEX=${FLEX} YACC=${YACC} HOME=${WRKDIR}	62	FLEX=${FLEX} YACC=${YACC} HOME=${WRKDIR}

Lines 1-28 Link Here

(-)print/lilypond-devel/pkg-plist (-21 / +44 lines)
1	bin/lilypond-book
2	bin/lilypond-invoke-editor
3	bin/lilypond
4	bin/lilysong
5	bin/lilymidi
6	bin/musicxml2ly
7	bin/abc2ly	1	bin/abc2ly
8	bin/convert-ly	2	bin/convert-ly
9	bin/etf2ly	3	bin/etf2ly
		4	bin/lilymidi
		5	bin/lilypond
		6	bin/lilypond-book
		7	bin/lilypond-invoke-editor
		8	bin/lilysong
10	bin/midi2ly	9	bin/midi2ly
		10	bin/musicxml2ly
		11	lib/lilypond/%%PORTVERSION%%/python/midi.so
		12	man/man1/abc2ly.1.gz
		13	man/man1/convert-ly.1.gz
		14	man/man1/etf2ly.1.gz
11	man/man1/lilymidi.1.gz	15	man/man1/lilymidi.1.gz
12	man/man1/lilypond-book.1.gz	16	man/man1/lilypond-book.1.gz
13	man/man1/lilypond-invoke-editor.1.gz	17	man/man1/lilypond-invoke-editor.1.gz
14	man/man1/lilypond.1.gz	18	man/man1/lilypond.1.gz
15	man/man1/lilysong.1.gz	19	man/man1/lilysong.1.gz
16	man/man1/convert-ly.1.gz
17	man/man1/abc2ly.1.gz
18	man/man1/etf2ly.1.gz
19	man/man1/midi2ly.1.gz	20	man/man1/midi2ly.1.gz
20	man/man1/musicxml2ly.1.gz	21	man/man1/musicxml2ly.1.gz
21	lib/lilypond/%%PORTVERSION%%/python/midi.so	22	share/emacs/site-lisp/lilypond-font-lock.el
22	%%DATADIR%%/%%PORTVERSION%%/fonts/otf/CenturySchL-Bold.otf	23	share/emacs/site-lisp/lilypond-indent.el
23	%%DATADIR%%/%%PORTVERSION%%/fonts/otf/CenturySchL-BoldItal.otf	24	share/emacs/site-lisp/lilypond-init.el
24	%%DATADIR%%/%%PORTVERSION%%/fonts/otf/CenturySchL-Ital.otf	25	share/emacs/site-lisp/lilypond-mode.el
25	%%DATADIR%%/%%PORTVERSION%%/fonts/otf/CenturySchL-Roma.otf	26	share/emacs/site-lisp/lilypond-song.el
		27	share/emacs/site-lisp/lilypond-what-beat.el
		28	share/emacs/site-lisp/lilypond-words.el
		29	%%DATADIR%%/%%PORTVERSION%%/fonts/00-lilypond-fonts.conf
		30	%%DATADIR%%/%%PORTVERSION%%/fonts/99-lilypond-fonts.conf
26	%%DATADIR%%/%%PORTVERSION%%/fonts/otf/emmentaler-11.otf	31	%%DATADIR%%/%%PORTVERSION%%/fonts/otf/emmentaler-11.otf
27	%%DATADIR%%/%%PORTVERSION%%/fonts/otf/emmentaler-13.otf	32	%%DATADIR%%/%%PORTVERSION%%/fonts/otf/emmentaler-13.otf
28	%%DATADIR%%/%%PORTVERSION%%/fonts/otf/emmentaler-14.otf	33	%%DATADIR%%/%%PORTVERSION%%/fonts/otf/emmentaler-14.otf
Lines 32-37 Link Here
32	%%DATADIR%%/%%PORTVERSION%%/fonts/otf/emmentaler-23.otf	37	%%DATADIR%%/%%PORTVERSION%%/fonts/otf/emmentaler-23.otf
33	%%DATADIR%%/%%PORTVERSION%%/fonts/otf/emmentaler-26.otf	38	%%DATADIR%%/%%PORTVERSION%%/fonts/otf/emmentaler-26.otf
34	%%DATADIR%%/%%PORTVERSION%%/fonts/otf/emmentaler-brace.otf	39	%%DATADIR%%/%%PORTVERSION%%/fonts/otf/emmentaler-brace.otf
		40	%%DATADIR%%/%%PORTVERSION%%/fonts/otf/texgyrecursor-bold.otf
		41	%%DATADIR%%/%%PORTVERSION%%/fonts/otf/texgyrecursor-bolditalic.otf
		42	%%DATADIR%%/%%PORTVERSION%%/fonts/otf/texgyrecursor-italic.otf
		43	%%DATADIR%%/%%PORTVERSION%%/fonts/otf/texgyrecursor-regular.otf
		44	%%DATADIR%%/%%PORTVERSION%%/fonts/otf/texgyreheros-bold.otf
		45	%%DATADIR%%/%%PORTVERSION%%/fonts/otf/texgyreheros-bolditalic.otf
		46	%%DATADIR%%/%%PORTVERSION%%/fonts/otf/texgyreheros-italic.otf
		47	%%DATADIR%%/%%PORTVERSION%%/fonts/otf/texgyreheros-regular.otf
		48	%%DATADIR%%/%%PORTVERSION%%/fonts/otf/texgyreschola-bold.otf
		49	%%DATADIR%%/%%PORTVERSION%%/fonts/otf/texgyreschola-bolditalic.otf
		50	%%DATADIR%%/%%PORTVERSION%%/fonts/otf/texgyreschola-italic.otf
		51	%%DATADIR%%/%%PORTVERSION%%/fonts/otf/texgyreschola-regular.otf
35	%%DATADIR%%/%%PORTVERSION%%/fonts/source/common-modules-and-initialization.mf	52	%%DATADIR%%/%%PORTVERSION%%/fonts/source/common-modules-and-initialization.mf
36	%%DATADIR%%/%%PORTVERSION%%/fonts/source/debugging-settings.mf	53	%%DATADIR%%/%%PORTVERSION%%/fonts/source/debugging-settings.mf
37	%%DATADIR%%/%%PORTVERSION%%/fonts/source/declare-autometric-parameters.mf	54	%%DATADIR%%/%%PORTVERSION%%/fonts/source/declare-autometric-parameters.mf
Lines 157-162 Link Here
157	%%DATADIR%%/%%PORTVERSION%%/ly/arabic.ly	174	%%DATADIR%%/%%PORTVERSION%%/ly/arabic.ly
158	%%DATADIR%%/%%PORTVERSION%%/ly/articulate.ly	175	%%DATADIR%%/%%PORTVERSION%%/ly/articulate.ly
159	%%DATADIR%%/%%PORTVERSION%%/ly/bagpipe.ly	176	%%DATADIR%%/%%PORTVERSION%%/ly/bagpipe.ly
		177	%%DATADIR%%/%%PORTVERSION%%/ly/base-tkit.ly
160	%%DATADIR%%/%%PORTVERSION%%/ly/catalan.ly	178	%%DATADIR%%/%%PORTVERSION%%/ly/catalan.ly
161	%%DATADIR%%/%%PORTVERSION%%/ly/chord-modifiers-init.ly	179	%%DATADIR%%/%%PORTVERSION%%/ly/chord-modifiers-init.ly
162	%%DATADIR%%/%%PORTVERSION%%/ly/chord-repetition-init.ly	180	%%DATADIR%%/%%PORTVERSION%%/ly/chord-repetition-init.ly
Lines 179-184 Link Here
179	%%DATADIR%%/%%PORTVERSION%%/ly/init.ly	197	%%DATADIR%%/%%PORTVERSION%%/ly/init.ly
180	%%DATADIR%%/%%PORTVERSION%%/ly/italiano.ly	198	%%DATADIR%%/%%PORTVERSION%%/ly/italiano.ly
181	%%DATADIR%%/%%PORTVERSION%%/ly/lilypond-book-preamble.ly	199	%%DATADIR%%/%%PORTVERSION%%/ly/lilypond-book-preamble.ly
		200	%%DATADIR%%/%%PORTVERSION%%/ly/lyrics-tkit.ly
182	%%DATADIR%%/%%PORTVERSION%%/ly/makam.ly	201	%%DATADIR%%/%%PORTVERSION%%/ly/makam.ly
183	%%DATADIR%%/%%PORTVERSION%%/ly/midi-init.ly	202	%%DATADIR%%/%%PORTVERSION%%/ly/midi-init.ly
184	%%DATADIR%%/%%PORTVERSION%%/ly/music-functions-init.ly	203	%%DATADIR%%/%%PORTVERSION%%/ly/music-functions-init.ly
Lines 186-191 Link Here
186	%%DATADIR%%/%%PORTVERSION%%/ly/norsk.ly	205	%%DATADIR%%/%%PORTVERSION%%/ly/norsk.ly
187	%%DATADIR%%/%%PORTVERSION%%/ly/paper-defaults-init.ly	206	%%DATADIR%%/%%PORTVERSION%%/ly/paper-defaults-init.ly
188	%%DATADIR%%/%%PORTVERSION%%/ly/performer-init.ly	207	%%DATADIR%%/%%PORTVERSION%%/ly/performer-init.ly
		208	%%DATADIR%%/%%PORTVERSION%%/ly/piano-tkit.ly
189	%%DATADIR%%/%%PORTVERSION%%/ly/portugues.ly	209	%%DATADIR%%/%%PORTVERSION%%/ly/portugues.ly
190	%%DATADIR%%/%%PORTVERSION%%/ly/predefined-fretboards-init.ly	210	%%DATADIR%%/%%PORTVERSION%%/ly/predefined-fretboards-init.ly
191	%%DATADIR%%/%%PORTVERSION%%/ly/predefined-guitar-fretboards.ly	211	%%DATADIR%%/%%PORTVERSION%%/ly/predefined-guitar-fretboards.ly
Lines 198-203 Link Here
198	%%DATADIR%%/%%PORTVERSION%%/ly/scheme-sandbox.ly	218	%%DATADIR%%/%%PORTVERSION%%/ly/scheme-sandbox.ly
199	%%DATADIR%%/%%PORTVERSION%%/ly/script-init.ly	219	%%DATADIR%%/%%PORTVERSION%%/ly/script-init.ly
200	%%DATADIR%%/%%PORTVERSION%%/ly/spanners-init.ly	220	%%DATADIR%%/%%PORTVERSION%%/ly/spanners-init.ly
		221	%%DATADIR%%/%%PORTVERSION%%/ly/ssaattbb.ly
		222	%%DATADIR%%/%%PORTVERSION%%/ly/staff-tkit.ly
201	%%DATADIR%%/%%PORTVERSION%%/ly/string-tunings-init.ly	223	%%DATADIR%%/%%PORTVERSION%%/ly/string-tunings-init.ly
202	%%DATADIR%%/%%PORTVERSION%%/ly/suomi.ly	224	%%DATADIR%%/%%PORTVERSION%%/ly/suomi.ly
203	%%DATADIR%%/%%PORTVERSION%%/ly/svenska.ly	225	%%DATADIR%%/%%PORTVERSION%%/ly/svenska.ly
Lines 205-210 Link Here
205	%%DATADIR%%/%%PORTVERSION%%/ly/titling-init.ly	227	%%DATADIR%%/%%PORTVERSION%%/ly/titling-init.ly
206	%%DATADIR%%/%%PORTVERSION%%/ly/toc-init.ly	228	%%DATADIR%%/%%PORTVERSION%%/ly/toc-init.ly
207	%%DATADIR%%/%%PORTVERSION%%/ly/vlaams.ly	229	%%DATADIR%%/%%PORTVERSION%%/ly/vlaams.ly
		230	%%DATADIR%%/%%PORTVERSION%%/ly/vocal-tkit.ly
		231	%%DATADIR%%/%%PORTVERSION%%/ly/voice-tkit.ly
		232	%%DATADIR%%/%%PORTVERSION%%/ps/encodingdefs.ps
208	%%DATADIR%%/%%PORTVERSION%%/ps/lilyponddefs.ps	233	%%DATADIR%%/%%PORTVERSION%%/ps/lilyponddefs.ps
209	%%DATADIR%%/%%PORTVERSION%%/ps/music-drawing-routines.ps	234	%%DATADIR%%/%%PORTVERSION%%/ps/music-drawing-routines.ps
210	%%DATADIR%%/%%PORTVERSION%%/python/book_base.py	235	%%DATADIR%%/%%PORTVERSION%%/python/book_base.py
Lines 231-240 Link Here
231	%%DATADIR%%/%%PORTVERSION%%/python/musicexp.pyc	256	%%DATADIR%%/%%PORTVERSION%%/python/musicexp.pyc
232	%%DATADIR%%/%%PORTVERSION%%/python/musicxml.py	257	%%DATADIR%%/%%PORTVERSION%%/python/musicxml.py
233	%%DATADIR%%/%%PORTVERSION%%/python/musicxml.pyc	258	%%DATADIR%%/%%PORTVERSION%%/python/musicxml.pyc
		259	%%DATADIR%%/%%PORTVERSION%%/python/musicxml2ly_conversion.py
		260	%%DATADIR%%/%%PORTVERSION%%/python/musicxml2ly_conversion.pyc
234	%%DATADIR%%/%%PORTVERSION%%/python/rational.py	261	%%DATADIR%%/%%PORTVERSION%%/python/rational.py
235	%%DATADIR%%/%%PORTVERSION%%/python/rational.pyc	262	%%DATADIR%%/%%PORTVERSION%%/python/rational.pyc
236	%%DATADIR%%/%%PORTVERSION%%/python/safeeval.py	263	%%DATADIR%%/%%PORTVERSION%%/python/safeeval.py
237	%%DATADIR%%/%%PORTVERSION%%/python/safeeval.pyc	264	%%DATADIR%%/%%PORTVERSION%%/python/safeeval.pyc
		265	%%DATADIR%%/%%PORTVERSION%%/python/utilities.py
		266	%%DATADIR%%/%%PORTVERSION%%/python/utilities.pyc
238	%%DATADIR%%/%%PORTVERSION%%/scm/accreg.scm	267	%%DATADIR%%/%%PORTVERSION%%/scm/accreg.scm
239	%%DATADIR%%/%%PORTVERSION%%/scm/auto-beam.scm	268	%%DATADIR%%/%%PORTVERSION%%/scm/auto-beam.scm
240	%%DATADIR%%/%%PORTVERSION%%/scm/autochange.scm	269	%%DATADIR%%/%%PORTVERSION%%/scm/autochange.scm
Lines 324-329 Link Here
324	%%DATADIR%%/%%PORTVERSION%%/scm/tablature.scm	353	%%DATADIR%%/%%PORTVERSION%%/scm/tablature.scm
325	%%DATADIR%%/%%PORTVERSION%%/scm/text.scm	354	%%DATADIR%%/%%PORTVERSION%%/scm/text.scm
326	%%DATADIR%%/%%PORTVERSION%%/scm/time-signature-settings.scm	355	%%DATADIR%%/%%PORTVERSION%%/scm/time-signature-settings.scm
		356	%%DATADIR%%/%%PORTVERSION%%/scm/time-signature.scm
327	%%DATADIR%%/%%PORTVERSION%%/scm/titling.scm	357	%%DATADIR%%/%%PORTVERSION%%/scm/titling.scm
328	%%DATADIR%%/%%PORTVERSION%%/scm/to-xml.scm	358	%%DATADIR%%/%%PORTVERSION%%/scm/to-xml.scm
329	%%DATADIR%%/%%PORTVERSION%%/scm/translation-functions.scm	359	%%DATADIR%%/%%PORTVERSION%%/scm/translation-functions.scm
Lines 337-349 Link Here
337	%%DATADIR%%/%%PORTVERSION%%/vim/syntax/lilypond-words.vim	367	%%DATADIR%%/%%PORTVERSION%%/vim/syntax/lilypond-words.vim
338	%%DATADIR%%/%%PORTVERSION%%/vim/syntax/lilypond.vim	368	%%DATADIR%%/%%PORTVERSION%%/vim/syntax/lilypond.vim
339	%%DATADIR%%/current	369	%%DATADIR%%/current
340	share/emacs/site-lisp/lilypond-font-lock.el
341	share/emacs/site-lisp/lilypond-indent.el
342	share/emacs/site-lisp/lilypond-init.el
343	share/emacs/site-lisp/lilypond-mode.el
344	share/emacs/site-lisp/lilypond-song.el
345	share/emacs/site-lisp/lilypond-what-beat.el
346	share/emacs/site-lisp/lilypond-words.el
347	%%NLS%%share/locale/ca/LC_MESSAGES/lilypond.mo	370	%%NLS%%share/locale/ca/LC_MESSAGES/lilypond.mo
348	%%NLS%%share/locale/cs/LC_MESSAGES/lilypond.mo	371	%%NLS%%share/locale/cs/LC_MESSAGES/lilypond.mo
349	%%NLS%%share/locale/da/LC_MESSAGES/lilypond.mo	372	%%NLS%%share/locale/da/LC_MESSAGES/lilypond.mo