diff options
Diffstat (limited to 'print')
11 files changed, 25 insertions, 17 deletions
diff --git a/print/lilypond-devel/Makefile b/print/lilypond-devel/Makefile index 3209b3343da7..783b72c8df90 100644 --- a/print/lilypond-devel/Makefile +++ b/print/lilypond-devel/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= lilypond -PORTVERSION= 2.19.51 -PORTREVISION= 1 +PORTVERSION= 2.19.57 CATEGORIES= print audio MASTER_SITES= http://download.linuxaudio.org/lilypond/sources/v${PORTVERSION:R}/ PKGNAMESUFFIX= -devel @@ -54,7 +53,6 @@ USE_GNOME= pango MAKEFILE= GNUmakefile GNU_MAKEFILE= yes -MAKE_JOBS_UNSAFE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-texgyre-dir=${LOCALBASE}/${TEXMFDISTDIR}/fonts/opentype/public/tex-gyre \ @@ -82,7 +80,6 @@ post-patch-NLS-off: post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lilypond - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lilypond/${PORTVERSION}/python/midi.so (cd ${STAGEDIR}/${DATADIR} && ${LN} -fs ${PORTVERSION} current) .include <bsd.port.mk> diff --git a/print/lilypond-devel/distinfo b/print/lilypond-devel/distinfo index 1fd1f071966d..afd50b6d8c52 100644 --- a/print/lilypond-devel/distinfo +++ b/print/lilypond-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1479644742 -SHA256 (lilypond-2.19.51.tar.gz) = 81163eccaeee083681b93b727eed00ed93f57899df9d423aba76f5e800db92ac -SIZE (lilypond-2.19.51.tar.gz) = 17061727 +TIMESTAMP = 1489482521 +SHA256 (lilypond-2.19.57.tar.gz) = be86019ae91cf78267081e96f35cf682931d0219215e160b16b03b907cac755a +SIZE (lilypond-2.19.57.tar.gz) = 17182103 diff --git a/print/lilypond-devel/files/patch-Documentation_GNUmakefile b/print/lilypond-devel/files/patch-Documentation_GNUmakefile index c52419da0884..2cd8552613d2 100644 --- a/print/lilypond-devel/files/patch-Documentation_GNUmakefile +++ b/print/lilypond-devel/files/patch-Documentation_GNUmakefile @@ -1,4 +1,4 @@ ---- Documentation/GNUmakefile.orig 2016-08-30 10:23:53 UTC +--- Documentation/GNUmakefile.orig 2017-02-26 12:08:59 UTC +++ Documentation/GNUmakefile @@ -73,9 +73,9 @@ source-links = $(outdir)/source\ MAIN_INFO_DOC = lilypond-web diff --git a/print/lilypond-devel/files/patch-config.make.in b/print/lilypond-devel/files/patch-config.make.in index 03b9f4d6634f..833c329decb7 100644 --- a/print/lilypond-devel/files/patch-config.make.in +++ b/print/lilypond-devel/files/patch-config.make.in @@ -1,6 +1,6 @@ ---- config.make.in.orig 2016-08-30 10:23:53 UTC +--- config.make.in.orig 2017-02-26 12:08:59 UTC +++ config.make.in -@@ -67,7 +67,7 @@ sharedstatedir = @sharedstatedir@ +@@ -69,7 +69,7 @@ sharedstatedir = @sharedstatedir@ stepmake = @stepmake@ package_datadir = $(datadir)/$(package) diff --git a/print/lilypond-devel/files/patch-configure b/print/lilypond-devel/files/patch-configure index d9db5b7462ca..614b6624ec6a 100644 --- a/print/lilypond-devel/files/patch-configure +++ b/print/lilypond-devel/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2016-08-30 10:23:53 UTC +--- configure.orig 2017-02-12 12:13:29 UTC +++ configure -@@ -11412,74 +11412,7 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no" +@@ -11503,74 +11503,7 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no" if test $? -eq 0 -a -n "0.9.0"; then diff --git a/print/lilypond-devel/files/patch-flower_include_std-string.hh b/print/lilypond-devel/files/patch-flower_include_std-string.hh index 2ca6f298f46d..4a1bc78d35f5 100644 --- a/print/lilypond-devel/files/patch-flower_include_std-string.hh +++ b/print/lilypond-devel/files/patch-flower_include_std-string.hh @@ -1,4 +1,4 @@ ---- flower/include/std-string.hh.orig 2016-08-30 10:23:53 UTC +--- flower/include/std-string.hh.orig 2017-02-26 12:08:59 UTC +++ flower/include/std-string.hh @@ -38,6 +38,7 @@ using namespace std; typedef size_t ssize; diff --git a/print/lilypond-devel/files/patch-flower_include_std-vector.hh b/print/lilypond-devel/files/patch-flower_include_std-vector.hh index c634f71aa9e3..6b5a18f75fb9 100644 --- a/print/lilypond-devel/files/patch-flower_include_std-vector.hh +++ b/print/lilypond-devel/files/patch-flower_include_std-vector.hh @@ -1,4 +1,4 @@ ---- flower/include/std-vector.hh.orig 2016-08-30 10:23:53 UTC +--- flower/include/std-vector.hh.orig 2017-02-26 12:08:59 UTC +++ flower/include/std-vector.hh @@ -212,6 +212,6 @@ junk_pointers (vector<T> &v) vector<string> string_split (string str, char c); diff --git a/print/lilypond-devel/files/patch-lily_include_lily-guile.hh b/print/lilypond-devel/files/patch-lily_include_lily-guile.hh index bf2a73df7985..513ea0ff2b13 100644 --- a/print/lilypond-devel/files/patch-lily_include_lily-guile.hh +++ b/print/lilypond-devel/files/patch-lily_include_lily-guile.hh @@ -1,4 +1,4 @@ ---- lily/include/lily-guile.hh.orig 2016-08-30 10:23:53 UTC +--- lily/include/lily-guile.hh.orig 2017-02-26 12:08:59 UTC +++ lily/include/lily-guile.hh @@ -20,6 +20,8 @@ #ifndef LILY_GUILE_HH diff --git a/print/lilypond-devel/files/patch-python_GNUmakefile b/print/lilypond-devel/files/patch-python_GNUmakefile new file mode 100644 index 000000000000..d3da0c816a28 --- /dev/null +++ b/print/lilypond-devel/files/patch-python_GNUmakefile @@ -0,0 +1,10 @@ +--- python/GNUmakefile.orig 2017-02-26 12:08:59 UTC ++++ python/GNUmakefile +@@ -14,7 +14,6 @@ CONFIG_LDFLAGS= + INSTALLATION_OUT_SUFFIXES=1 + + INSTALLATION_OUT_FILES=$(OUT_SO_MODULES) +-INSTALLATION_OUT_DIR=$(local_lilypond_libdir)/python + + INSTALLATION_OUT_DIR1=$(local_lilypond_datadir)/python + INSTALLATION_OUT_FILES1=$(OUT_PY_MODULES) $(OUT_PYC_MODULES) diff --git a/print/lilypond-devel/files/patch-stepmake_stepmake_texinfo-vars.make b/print/lilypond-devel/files/patch-stepmake_stepmake_texinfo-vars.make index 738377e1df94..291221eddce0 100644 --- a/print/lilypond-devel/files/patch-stepmake_stepmake_texinfo-vars.make +++ b/print/lilypond-devel/files/patch-stepmake_stepmake_texinfo-vars.make @@ -1,4 +1,4 @@ ---- stepmake/stepmake/texinfo-vars.make.orig 2016-08-30 10:23:53 UTC +--- stepmake/stepmake/texinfo-vars.make.orig 2017-02-26 12:08:59 UTC +++ stepmake/stepmake/texinfo-vars.make @@ -31,7 +31,7 @@ DO_TEXI_DEP = ( echo ./$@: $(call scan-t diff --git a/print/lilypond-devel/pkg-plist b/print/lilypond-devel/pkg-plist index 407db9a89917..214109b28b94 100644 --- a/print/lilypond-devel/pkg-plist +++ b/print/lilypond-devel/pkg-plist @@ -8,7 +8,6 @@ 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 @@ -252,6 +251,8 @@ share/emacs/site-lisp/lilypond-words.el %%DATADIR%%/%%PORTVERSION%%/python/langdefs.pyc %%DATADIR%%/%%PORTVERSION%%/python/lilylib.py %%DATADIR%%/%%PORTVERSION%%/python/lilylib.pyc +%%DATADIR%%/%%PORTVERSION%%/python/midi.py +%%DATADIR%%/%%PORTVERSION%%/python/midi.pyc %%DATADIR%%/%%PORTVERSION%%/python/musicexp.py %%DATADIR%%/%%PORTVERSION%%/python/musicexp.pyc %%DATADIR%%/%%PORTVERSION%%/python/musicxml.py |