mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-21 08:42:23 +00:00
Code Issues Releases Activity

print/lilypond-devel: update to 2.19.47, submitter is the new maintainer

Browse Source 
PR:		212435
Submitted by:	m.ne@gmx.net
This commit is contained in:
Pietro Cerutti 2016-09-08 07:59:58 +00:00
parent 9bf6f99a3c
commit e44feeb7e2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=421535
10 changed files with 160 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
print/lilypond-devel/Makefile
View File

@ -2,13 +2,12 @@
# $FreeBSD$
PORTNAME= lilypond
PORTVERSION= 2.19.11
PORTREVISION= 5
PORTVERSION= 2.19.47
CATEGORIES= print audio
MASTER_SITES= http://download.linuxaudio.org/lilypond/sources/v${PORTVERSION:R}/
PKGNAMESUFFIX= -devel
MAINTAINER= ports@FreeBSD.org
MAINTAINER= m.ne@gmx.net
COMMENT= GNU music typesetter
LICENSE= GPLv3
@ -23,8 +22,7 @@ BUILD_DEPENDS= pdftexi2dvi:print/texinfo \
pngtopnm:graphics/netpbm \
rsync:net/rsync \
texi2html:textproc/texi2html \
zip:archivers/zip \
${LOCALBASE}/share/ghostscript/fonts/c059033l.pfb:print/gsfonts
zip:archivers/zip
RUN_DEPENDS= mftrace:print/mftrace \
${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejavu
LIB_DEPENDS= libguile.so:lang/guile \
@ -32,9 +30,6 @@ 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 \
@ -50,9 +45,9 @@ INFO= internals \
music-glossary
USES= bison:build gettext ghostscript gmake pkgconfig perl5 \
compiler:c++11-lib python:-3
compiler:gcc-c++11-lib python:-3
USE_CXXSTD= c++11
USE_TEX= latex
USE_TEX= latex texmf
USE_PERL5= build
USE_GNOME= pango
@ -61,7 +56,7 @@ GNU_MAKEFILE= yes
MAKE_JOBS_UNSAFE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-ncsb-dir=${LOCALBASE}/share/ghostscript/fonts \
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}

5
print/lilypond-devel/distinfo
View File

@ -1,2 +1,3 @@
SHA256 (lilypond-2.19.11.tar.gz) = 5245aba230ccc0a217d25079eca44cea637c6897d99ff094f4145cacef70bbb0
SIZE (lilypond-2.19.11.tar.gz) = 16304635
TIMESTAMP = 1472857204
SHA256 (lilypond-2.19.47.tar.gz) = 842312813a9144b6b54a33f13fb19addbfc779d7bbfe3b2075be1235287de08c
SIZE (lilypond-2.19.47.tar.gz) = 16926783

6
print/lilypond-devel/files/patch-Documentation_GNUmakefile
View File

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

8
print/lilypond-devel/files/patch-config.make.in
View File

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

78
print/lilypond-devel/files/patch-configure Normal file
View File

@ -0,0 +1,78 @@
--- 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)"\"`\"

8
print/lilypond-devel/files/patch-flower-include_std-string.hh → print/lilypond-devel/files/patch-flower_include_std-string.hh
View File

@ -1,6 +1,6 @@
--- 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 @@
--- 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
@ -8,7 +8,7 @@
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 @@
@@ -49,6 +50,7 @@ string to_string (unsigned);
string to_string (bool b);
string to_string (char const *format, ...)
__attribute__ ((format (printf, 1, 2)));

6
print/lilypond-devel/files/patch-flower-include_std-vector.hh → print/lilypond-devel/files/patch-flower_include_std-vector.hh
View File

@ -1,6 +1,6 @@
--- flower/include/std-vector.hh.orig 2014-05-05 10:25:02.000000000 +0200
+++ flower/include/std-vector.hh 2014-05-05 10:28:54.000000000 +0200
@@ -261,6 +261,6 @@
--- flower/include/std-vector.hh.orig 2016-08-30 10:23:53 UTC
+++ flower/include/std-vector.hh
@@ -212,6 +212,6 @@ junk_pointers (vector<T> &v)
vector<string> string_split (string str, char c);
string string_join (vector<string> const &strs, const string &infix);

11
print/lilypond-devel/files/patch-lily_include_lily-guile.hh Normal file
View File

@ -0,0 +1,11 @@
--- lily/include/lily-guile.hh.orig 2016-08-30 10:23:53 UTC
+++ lily/include/lily-guile.hh
@@ -20,6 +20,8 @@
#ifndef LILY_GUILE_HH
#define LILY_GUILE_HH
+#include <cstddef>
+
#if __MINGW32__
#include "mingw-compatibility.hh"
#endif

8
print/lilypond-devel/files/patch-stepmake_stepmake_texinfo-vars.make
View File

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

65
print/lilypond-devel/pkg-plist
View File

@ -1,28 +1,33 @@
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
lib/lilypond/%%PORTVERSION%%/python/midi.so
%%DATADIR%%/%%PORTVERSION%%/fonts/otf/CenturySchL-Bold.otf
%%DATADIR%%/%%PORTVERSION%%/fonts/otf/CenturySchL-BoldItal.otf
%%DATADIR%%/%%PORTVERSION%%/fonts/otf/CenturySchL-Ital.otf
%%DATADIR%%/%%PORTVERSION%%/fonts/otf/CenturySchL-Roma.otf
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
@ -32,6 +37,18 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
%%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
@ -157,6 +174,7 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
%%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
@ -179,6 +197,7 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
%%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
@ -186,6 +205,7 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
%%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
@ -198,6 +218,8 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
%%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
@ -205,6 +227,9 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
%%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
@ -231,10 +256,14 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
%%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
@ -324,6 +353,7 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
%%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
@ -337,13 +367,6 @@ lib/lilypond/%%PORTVERSION%%/python/midi.so
%%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