Update to lilypond-2.18.2.
Initial diff and testing of the final diff on i386 and amd64 by Graeme Lee (thanks!).
This commit is contained in:
parent
8df1bd6492
commit
d6200cd774
@ -1,16 +1,15 @@
|
||||
# $OpenBSD: Makefile,v 1.40 2013/10/11 23:50:40 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.41 2014/05/27 20:43:50 kili Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
COMMENT-main= text based music notation system
|
||||
COMMENT-docs= lilypond documentation
|
||||
|
||||
VERSION= 2.14.2
|
||||
VERSION= 2.18.2
|
||||
DISTNAME= lilypond-${VERSION}
|
||||
DISTNAME-docs= ${DISTNAME}-1.documentation
|
||||
PKGNAME-main= lilypond-${VERSION}
|
||||
PKGNAME-docs= lilypond-docs-${VERSION}
|
||||
REVISION-main = 1
|
||||
CATEGORIES= print
|
||||
|
||||
DISTFILES= ${DISTNAME}.tar.gz ${DISTNAME-docs}.tar.bz2:0
|
||||
@ -43,7 +42,8 @@ CONFIGURE_ARGS+= --disable-debugging \
|
||||
--disable-documentation \
|
||||
--disable-optimising \
|
||||
--disable-pipe \
|
||||
--with-ncsb-dir=${LOCALBASE}/share/ghostscript/fonts
|
||||
--with-ncsb-dir=${LOCALBASE}/share/ghostscript/fonts \
|
||||
--with-python-include=${MODPY_INCDIR}
|
||||
USE_GMAKE= Yes
|
||||
MAKE_FILE= GNUmakefile
|
||||
|
||||
@ -56,7 +56,7 @@ WANTLIB-docs =
|
||||
LIB_DEPENDS-docs=
|
||||
RUN_DEPENDS-docs=
|
||||
|
||||
WANTLIB-main= X11 c expat fontconfig freetype gmp gthread-2.0 ltdl m \
|
||||
WANTLIB-main= c fontconfig freetype gmp gthread-2.0 ltdl m \
|
||||
pthread stdc++ z guile>=20 glib-2.0>=1000 \
|
||||
gmodule-2.0>=1000 gobject-2.0>=1000 \
|
||||
pango-1.0>=1200 pangoft2-1.0>=1200 ${WANTLIB}
|
||||
@ -84,7 +84,7 @@ post-extract:
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/lilypond/${VERSION}
|
||||
umask 022 && cp -R ${WRKDIR}/docs/share/doc/lilypond/html/offline-root/* \
|
||||
umask 022 && cp -R ${WRKDIR}/docs/share/doc/lilypond/html/* \
|
||||
${PREFIX}/share/doc/lilypond/${VERSION}
|
||||
for f in ${WRKDIR}/docs/share/man/man1/*; do \
|
||||
${INSTALL_MAN} $$f ${PREFIX}/man/man1; \
|
||||
|
@ -1,10 +1,4 @@
|
||||
MD5 (lilypond-2.14.2-1.documentation.tar.bz2) = zbE+hhlpRobjCZCght9z7w==
|
||||
MD5 (lilypond-2.14.2.tar.gz) = QFOhngMYECGJOYEoD+uaqg==
|
||||
RMD160 (lilypond-2.14.2-1.documentation.tar.bz2) = bDiyM4nDAsrP7XGEgujR0Ds+flg=
|
||||
RMD160 (lilypond-2.14.2.tar.gz) = dBI7LbQFGf6vgUT9Gb7POtgXOOc=
|
||||
SHA1 (lilypond-2.14.2-1.documentation.tar.bz2) = 2i5mpgTAb/VeZuEeyIEsLDK0z28=
|
||||
SHA1 (lilypond-2.14.2.tar.gz) = DqZXuxhNnWouP2vKkeaw1io6AT4=
|
||||
SHA256 (lilypond-2.14.2-1.documentation.tar.bz2) = cKiATto+98YtLwEgYVCuWKFFUKESQz13kU++RY5gUDw=
|
||||
SHA256 (lilypond-2.14.2.tar.gz) = JDprOEVyKjcIPXPtaB5p/94LO5xhWK8g2zwJJt2YJpY=
|
||||
SIZE (lilypond-2.14.2-1.documentation.tar.bz2) = 188317987
|
||||
SIZE (lilypond-2.14.2.tar.gz) = 15224418
|
||||
SHA256 (lilypond-2.18.2-1.documentation.tar.bz2) = 49dHQgBEjJZ3klzPT5CYLKh+j3ieFDr9xr85fw42i5k=
|
||||
SHA256 (lilypond-2.18.2.tar.gz) = Mp1zN2Wwunvhh4rj9Ffbu4dcwoQNK3WvSvxIyUVPugc=
|
||||
SIZE (lilypond-2.18.2-1.documentation.tar.bz2) = 231545058
|
||||
SIZE (lilypond-2.18.2.tar.gz) = 16027977
|
||||
|
26
print/lilypond/patches/patch-aclocal_m4
Normal file
26
print/lilypond/patches/patch-aclocal_m4
Normal file
@ -0,0 +1,26 @@
|
||||
$OpenBSD: patch-aclocal_m4,v 1.1 2014/05/27 20:43:50 kili Exp $
|
||||
|
||||
- Fix version comparision for large version numbers.
|
||||
|
||||
- Allow older (buggy?) metapost.
|
||||
|
||||
--- aclocal.m4.orig Mon Mar 17 16:29:16 2014
|
||||
+++ aclocal.m4 Thu May 22 20:15:38 2014
|
||||
@@ -116,7 +116,7 @@ AC_DEFUN(STEPMAKE_CHECK_VERSION, [
|
||||
num=`STEPMAKE_NUMERIC_VERSION($ver)`
|
||||
req=`STEPMAKE_NUMERIC_VERSION($3)`
|
||||
AC_MSG_RESULT([$ver])
|
||||
- if test "$num" -lt "$req"; then
|
||||
+ if test $(dc -e "[[1]] sa 0 $num $req <a p") = 0; then
|
||||
STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"])
|
||||
fi
|
||||
vervar="`echo $1 | tr '[a-z]' '[A-Z]'`_VERSION"
|
||||
@@ -1171,7 +1171,7 @@ AC_DEFUN(STEPMAKE_TEXMF, [
|
||||
ver=`STEPMAKE_GET_VERSION($METAPOST)`
|
||||
num=`STEPMAKE_NUMERIC_VERSION($ver)`
|
||||
# Avoid buggy metapost versions: 1.600 <= x < 1.803
|
||||
- if test "$num" -ge "1600000" -a "$num" -lt "1803000"; then
|
||||
+ if test "$num" -ge "1600000" -a "$num" -lt "1801000"; then
|
||||
STEPMAKE_ADD_ENTRY($1, ["mpost (due to a bug in metapost, versions 1.600 <= x < 1.803 are not supported; installed: $ver)"])
|
||||
fi
|
||||
fi
|
29
print/lilypond/patches/patch-configure_ac
Normal file
29
print/lilypond/patches/patch-configure_ac
Normal file
@ -0,0 +1,29 @@
|
||||
$OpenBSD: patch-configure_ac,v 1.1 2014/05/27 20:43:50 kili Exp $
|
||||
|
||||
# Builds fine with gcc 3.3.5 and without makeinfo (unless you try to
|
||||
# build the documentation).
|
||||
|
||||
--- configure.ac.orig Mon Mar 17 16:29:16 2014
|
||||
+++ configure.ac Thu May 22 19:53:41 2014
|
||||
@@ -109,10 +109,10 @@ STEPMAKE_PYTHON(REQUIRED, 2.4, 3.0)
|
||||
# __GNUC__, but that macro now unofficially means "the compiler
|
||||
# supports the GNU C extensions" -- the intel C compiler and clang
|
||||
# both support __GNUC__!
|
||||
-STEPMAKE_GCC_OR_CLANG(REQUIRED, 3.4)
|
||||
+STEPMAKE_GCC_OR_CLANG(REQUIRED, 3.3)
|
||||
|
||||
STEPMAKE_CXX(REQUIRED)
|
||||
-STEPMAKE_GXX_OR_CLANG(REQUIRED, 3.4)
|
||||
+STEPMAKE_GXX_OR_CLANG(REQUIRED, 3.3)
|
||||
STEPMAKE_GXXCODEGENBUG
|
||||
STEPMAKE_CXXTEMPLATE
|
||||
STEPMAKE_STL_DATA_METHOD
|
||||
@@ -226,7 +226,7 @@ fi
|
||||
|
||||
STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, $DOCUMENTATION_REQUIRED, 8.60)
|
||||
|
||||
-STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.11)
|
||||
+STEPMAKE_PROGS(MAKEINFO, makeinfo, OPTIONAL, 4.11)
|
||||
STEPMAKE_PROGS(TEXI2HTML, texi2html, $DOCUMENTATION_REQUIRED, 1.82)
|
||||
STEPMAKE_PROGS(DBLATEX, dblatex, $DOCUMENTATION_REQUIRED, 0.1.4)
|
||||
STEPMAKE_PROGS(BIBTEX, bibtex, $DOCUMENTATION_REQUIRED)
|
@ -1,29 +0,0 @@
|
||||
$OpenBSD: patch-configure_in,v 1.4 2011/07/06 14:14:06 kili Exp $
|
||||
|
||||
# Builds fine with gcc 3.3.5 without makeinfo (unless you try to
|
||||
# build the documentation).
|
||||
|
||||
--- configure.in.orig Sun Jun 12 16:05:50 2011
|
||||
+++ configure.in Mon Jul 4 15:29:57 2011
|
||||
@@ -91,10 +91,10 @@ AC_MSG_RESULT($NCSB_SOURCE_FILES)
|
||||
AC_LANG([C++])
|
||||
|
||||
STEPMAKE_PYTHON(REQUIRED, 2.4)
|
||||
-STEPMAKE_GCC(REQUIRED, 3.4)
|
||||
+STEPMAKE_GCC(REQUIRED, 3.3)
|
||||
|
||||
STEPMAKE_CXX(REQUIRED)
|
||||
-STEPMAKE_GXX(REQUIRED, 3.4)
|
||||
+STEPMAKE_GXX(REQUIRED, 3.3)
|
||||
STEPMAKE_CXXTEMPLATE
|
||||
STEPMAKE_STL_DATA_METHOD
|
||||
STEPMAKE_LIB(REQUIRED)
|
||||
@@ -185,7 +185,7 @@ STEPMAKE_GUILE(OPTIONAL)
|
||||
# perl for help2man.
|
||||
STEPMAKE_PERL(OPTIONAL)
|
||||
|
||||
-STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.11)
|
||||
+STEPMAKE_PROGS(MAKEINFO, makeinfo, OPTIONAL, 4.11)
|
||||
STEPMAKE_PROGS(TEXI2HTML, texi2html, OPTIONAL, 1.82)
|
||||
STEPMAKE_PROGS(DBLATEX, dblatex, OPTIONAL)
|
||||
STEPMAKE_PROGS(PDFLATEX, pdflatex, OPTIONAL)
|
@ -1,13 +0,0 @@
|
||||
$OpenBSD: patch-lily_freetype-error_cc,v 1.1 2014/01/10 18:17:06 landry Exp $
|
||||
--- lily/freetype-error.cc.orig Fri Jan 10 18:55:04 2014
|
||||
+++ lily/freetype-error.cc Fri Jan 10 18:55:25 2014
|
||||
@@ -31,7 +31,8 @@ const struct Freetype_error_message
|
||||
const char* err_msg;
|
||||
} ft_errors[] =
|
||||
|
||||
-#include <freetype/fterrors.h>
|
||||
+#include <ft2build.h>
|
||||
+#include FT_ERRORS_H
|
||||
|
||||
;
|
||||
|
@ -1,14 +1,14 @@
|
||||
$OpenBSD: patch-lily_include_open-type-font_hh,v 1.2 2011/07/06 14:14:06 kili Exp $
|
||||
--- lily/include/open-type-font.hh.orig Sun Jun 12 16:05:50 2011
|
||||
+++ lily/include/open-type-font.hh Sun Jun 19 13:45:40 2011
|
||||
@@ -24,8 +24,8 @@
|
||||
$OpenBSD: patch-lily_include_open-type-font_hh,v 1.3 2014/05/27 20:43:50 kili Exp $
|
||||
--- lily/include/open-type-font.hh.orig Tue May 13 10:13:58 2014
|
||||
+++ lily/include/open-type-font.hh Tue May 13 10:15:05 2014
|
||||
@@ -23,8 +23,8 @@
|
||||
#include "font-metric.hh"
|
||||
|
||||
Index_to_charcode_map make_index_to_charcode_map (FT_Face face);
|
||||
-void get_unicode_name (char*s, FT_ULong code);
|
||||
-void get_glyph_index_name (char*s, FT_ULong code);
|
||||
+void get_unicode_name (char*s, size_t size, FT_ULong code);
|
||||
+void get_glyph_index_name (char*s, size_t size, FT_ULong code);
|
||||
-void get_unicode_name (char *s, FT_ULong code);
|
||||
-void get_glyph_index_name (char *s, FT_ULong code);
|
||||
+void get_unicode_name (char *s, size_t size, FT_ULong code);
|
||||
+void get_glyph_index_name (char *s, size_t size, FT_ULong code);
|
||||
|
||||
class Open_type_font : public Font_metric
|
||||
{
|
||||
|
@ -1,28 +0,0 @@
|
||||
$OpenBSD: patch-lily_include_smobs_hh,v 1.3 2011/07/06 14:14:06 kili Exp $
|
||||
|
||||
Make g++ 3.3.5 happy.
|
||||
|
||||
--- lily/include/smobs.hh.orig Sun Jun 12 16:05:50 2011
|
||||
+++ lily/include/smobs.hh Sun Jun 19 13:45:40 2011
|
||||
@@ -104,6 +104,12 @@
|
||||
SCM smobbed_copy () const; \
|
||||
DECLARE_BASE_SMOBS (CL)
|
||||
|
||||
+#if __GNUC__ < 3 || __GNUC__ == 3 && __GNUC_MINOR__ < 4
|
||||
+# define ATTR_PURE
|
||||
+#else
|
||||
+# define ATTR_PURE __attribute__((pure))
|
||||
+#endif
|
||||
+
|
||||
#define DECLARE_BASE_SMOBS(CL) \
|
||||
friend class Non_existent_class; \
|
||||
private: \
|
||||
@@ -114,7 +120,7 @@
|
||||
static int print_smob (SCM s, SCM p, scm_print_state*); \
|
||||
public: \
|
||||
static SCM equal_p (SCM a, SCM b); \
|
||||
- static CL *unsmob (SCM s) __attribute__((pure)) \
|
||||
+ static CL *unsmob (SCM s) ATTR_PURE \
|
||||
{ \
|
||||
if (SCM_NIMP (s) && SCM_CELL_TYPE (s) == smob_tag_) \
|
||||
return (CL *) SCM_CELL_WORD_1 (s); \
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-lily_music-iterator_cc,v 1.2 2011/07/06 14:14:06 kili Exp $
|
||||
--- lily/music-iterator.cc.orig Sun Jun 12 16:05:50 2011
|
||||
+++ lily/music-iterator.cc Sun Jun 19 13:45:40 2011
|
||||
@@ -222,7 +222,7 @@ Music_iterator::print_smob (SCM sm, SCM port, scm_prin
|
||||
$OpenBSD: patch-lily_music-iterator_cc,v 1.3 2014/05/27 20:43:50 kili Exp $
|
||||
--- lily/music-iterator.cc.orig Tue May 13 10:19:28 2014
|
||||
+++ lily/music-iterator.cc Tue May 13 10:19:59 2014
|
||||
@@ -224,7 +224,7 @@ Music_iterator::print_smob (SCM sm, SCM port, scm_prin
|
||||
char s[1000];
|
||||
|
||||
Music_iterator *iter = unsmob_iterator (sm);
|
||||
|
@ -1,28 +0,0 @@
|
||||
$OpenBSD: patch-lily_open-type-font_cc,v 1.2 2014/01/10 18:17:07 landry Exp $
|
||||
|
||||
Make g++-3.3.5 happy.
|
||||
|
||||
--- lily/open-type-font.cc.orig Tue Jul 26 00:42:15 2011
|
||||
+++ lily/open-type-font.cc Fri Jan 10 18:54:41 2014
|
||||
@@ -23,7 +23,8 @@
|
||||
|
||||
using namespace std;
|
||||
|
||||
-#include <freetype/tttables.h>
|
||||
+#include <ft2build.h>
|
||||
+#include FT_TRUETYPE_TABLES_H
|
||||
|
||||
#include "dimensions.hh"
|
||||
#include "international.hh"
|
||||
@@ -220,8 +221,9 @@ Open_type_font::get_indexed_char_dimensions (size_t si
|
||||
FT_Glyph_Metrics m = face_->glyph->metrics;
|
||||
FT_Pos hb = m.horiBearingX;
|
||||
FT_Pos vb = m.horiBearingY;
|
||||
- Box b (Interval (Real (-hb), Real (m.width - hb)),
|
||||
- Interval (Real (-vb), Real (m.height - vb)));
|
||||
+ Interval ih (Real (-hb), Real (m.width - hb));
|
||||
+ Interval iv (Real (-vb), Real (m.height - vb));
|
||||
+ Box b (ih, iv);
|
||||
|
||||
b.scale (design_size () / Real (face_->units_per_EM));
|
||||
return b;
|
@ -1,22 +1,12 @@
|
||||
$OpenBSD: patch-lily_pango-font_cc,v 1.3 2014/01/10 18:17:07 landry Exp $
|
||||
--- lily/pango-font.cc.orig Tue Jul 26 00:42:15 2011
|
||||
+++ lily/pango-font.cc Fri Jan 10 18:56:00 2014
|
||||
@@ -22,7 +22,8 @@
|
||||
#define PANGO_ENABLE_BACKEND
|
||||
|
||||
#include <pango/pangoft2.h>
|
||||
-#include <freetype/ftxf86.h>
|
||||
+#include <ft2build.h>
|
||||
+#include FT_XFREE86_H
|
||||
|
||||
#include <map>
|
||||
#include <cstdio>
|
||||
@@ -95,19 +96,21 @@ Pango_font::derived_mark () const
|
||||
$OpenBSD: patch-lily_pango-font_cc,v 1.4 2014/05/27 20:43:50 kili Exp $
|
||||
--- lily/pango-font.cc.orig Tue May 13 10:22:35 2014
|
||||
+++ lily/pango-font.cc Tue May 13 10:26:47 2014
|
||||
@@ -116,19 +116,21 @@ Pango_font::derived_mark () const
|
||||
|
||||
void
|
||||
get_glyph_index_name (char *s,
|
||||
+ size_t size,
|
||||
FT_ULong code)
|
||||
FT_ULong code)
|
||||
{
|
||||
- sprintf (s, "glyphIndex%lX", code);
|
||||
+ snprintf (s, size, "glyphIndex%lX", code);
|
||||
@ -25,7 +15,7 @@ $OpenBSD: patch-lily_pango-font_cc,v 1.3 2014/01/10 18:17:07 landry Exp $
|
||||
void
|
||||
get_unicode_name (char *s,
|
||||
+ size_t size,
|
||||
FT_ULong code)
|
||||
FT_ULong code)
|
||||
{
|
||||
if (code > 0xFFFF)
|
||||
- sprintf (s, "u%lX", code);
|
||||
@ -35,22 +25,22 @@ $OpenBSD: patch-lily_pango-font_cc,v 1.3 2014/01/10 18:17:07 landry Exp $
|
||||
+ snprintf (s, size, "uni%04lX", code);
|
||||
}
|
||||
|
||||
Stencil
|
||||
@@ -195,7 +198,7 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem
|
||||
&& cmap->find (pg) != cmap->end ())
|
||||
{
|
||||
FT_ULong char_code = cmap->find (pg)->second;
|
||||
- get_unicode_name (glyph_name, char_code);
|
||||
+ get_unicode_name (glyph_name, sizeof(glyph_name), char_code);
|
||||
}
|
||||
Box
|
||||
@@ -265,7 +267,7 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem
|
||||
&& cmap->find (pg) != cmap->end ())
|
||||
{
|
||||
FT_ULong char_code = cmap->find (pg)->second;
|
||||
- get_unicode_name (glyph_name, char_code);
|
||||
+ get_unicode_name (glyph_name, sizeof(glyph_name), char_code);
|
||||
}
|
||||
|
||||
if (glyph_name[0] == '\0' && has_glyph_names)
|
||||
@@ -212,7 +215,7 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem
|
||||
@@ -281,7 +283,7 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem
|
||||
|
||||
if (glyph_name[0] == '\0' && is_ttf)
|
||||
// Access by glyph index directly.
|
||||
- get_glyph_index_name (glyph_name, pg);
|
||||
+ get_glyph_index_name (glyph_name, sizeof(glyph_name), pg);
|
||||
// Access by glyph index directly.
|
||||
- get_glyph_index_name (glyph_name, pg);
|
||||
+ get_glyph_index_name (glyph_name, sizeof(glyph_name), pg);
|
||||
|
||||
if (glyph_name[0] == '\0')
|
||||
{
|
||||
{
|
||||
|
@ -1,31 +1,21 @@
|
||||
$OpenBSD: patch-lily_ttf_cc,v 1.5 2014/01/10 18:17:07 landry Exp $
|
||||
--- lily/ttf.cc.orig Tue Jul 26 00:42:15 2011
|
||||
+++ lily/ttf.cc Fri Jan 10 18:56:22 2014
|
||||
@@ -20,7 +20,8 @@
|
||||
#include <cstdio>
|
||||
#include "freetype.hh"
|
||||
|
||||
-#include <freetype/tttables.h>
|
||||
+#include <ft2build.h>
|
||||
+#include FT_TRUETYPE_TABLES_H
|
||||
|
||||
#include "international.hh"
|
||||
#include "memory-stream.hh"
|
||||
@@ -440,7 +441,7 @@ print_trailer (void *out,
|
||||
$OpenBSD: patch-lily_ttf_cc,v 1.6 2014/05/27 20:43:50 kili Exp $
|
||||
--- lily/ttf.cc.orig Tue May 13 10:25:46 2014
|
||||
+++ lily/ttf.cc Tue May 13 10:26:24 2014
|
||||
@@ -439,7 +439,7 @@ print_trailer (void *out,
|
||||
if (!glyph_name[0] && ic_map.find (i) != ic_map.end ())
|
||||
{
|
||||
FT_ULong ucode = ic_map[i];
|
||||
- get_unicode_name (glyph_name, ucode);
|
||||
+ get_unicode_name (glyph_name, sizeof(glyph_name), ucode);
|
||||
}
|
||||
{
|
||||
FT_ULong ucode = ic_map[i];
|
||||
- get_unicode_name (glyph_name, ucode);
|
||||
+ get_unicode_name (glyph_name, sizeof(glyph_name), ucode);
|
||||
}
|
||||
|
||||
if (i == 0)
|
||||
@@ -449,7 +450,7 @@ print_trailer (void *out,
|
||||
glyph_name[0] = '\0';
|
||||
@@ -448,7 +448,7 @@ print_trailer (void *out,
|
||||
glyph_name[0] = '\0';
|
||||
|
||||
if (!glyph_name[0])
|
||||
- get_glyph_index_name (glyph_name, i);
|
||||
+ get_glyph_index_name (glyph_name, sizeof(glyph_name), i);
|
||||
- get_glyph_index_name (glyph_name, i);
|
||||
+ get_glyph_index_name (glyph_name, sizeof(glyph_name), i);
|
||||
|
||||
if (glyph_name[0])
|
||||
{
|
||||
{
|
||||
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-stepmake_aclocal_m4,v 1.5 2014/01/17 21:01:39 kili Exp $
|
||||
--- stepmake/aclocal.m4.orig Tue Jul 26 00:42:15 2011
|
||||
+++ stepmake/aclocal.m4 Fri Jan 17 19:54:08 2014
|
||||
@@ -116,7 +116,7 @@ AC_DEFUN(STEPMAKE_CHECK_VERSION, [
|
||||
num=`STEPMAKE_NUMERIC_VERSION($ver)`
|
||||
req=`STEPMAKE_NUMERIC_VERSION($3)`
|
||||
AC_MSG_RESULT([$ver])
|
||||
- if test "$num" -lt "$req"; then
|
||||
+ if test $(dc -e "[[1]] sa 0 $num $req <a p") = 0; then
|
||||
STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"])
|
||||
fi
|
||||
vervar="`echo $1 | tr '[a-z]' '[A-Z]'`_VERSION"
|
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST-main,v 1.8 2011/07/06 14:14:06 kili Exp $
|
||||
@comment $OpenBSD: PLIST-main,v 1.9 2014/05/27 20:43:50 kili Exp $
|
||||
@pkgpath print/lilypond
|
||||
bin/abc2ly
|
||||
bin/convert-ly
|
||||
@ -76,11 +76,19 @@ share/lilypond/${VERSION}/fonts/source/feta-brackettips.mf
|
||||
share/lilypond/${VERSION}/fonts/source/feta-clefs.mf
|
||||
share/lilypond/${VERSION}/fonts/source/feta-dots.mf
|
||||
share/lilypond/${VERSION}/fonts/source/feta-dynamics.mf
|
||||
share/lilypond/${VERSION}/fonts/source/feta-flags-generic.mf
|
||||
share/lilypond/${VERSION}/fonts/source/feta-flags.mf
|
||||
share/lilypond/${VERSION}/fonts/source/feta-flags11.mf
|
||||
share/lilypond/${VERSION}/fonts/source/feta-flags13.mf
|
||||
share/lilypond/${VERSION}/fonts/source/feta-flags14.mf
|
||||
share/lilypond/${VERSION}/fonts/source/feta-flags16.mf
|
||||
share/lilypond/${VERSION}/fonts/source/feta-flags18.mf
|
||||
share/lilypond/${VERSION}/fonts/source/feta-flags20.mf
|
||||
share/lilypond/${VERSION}/fonts/source/feta-flags23.mf
|
||||
share/lilypond/${VERSION}/fonts/source/feta-flags26.mf
|
||||
share/lilypond/${VERSION}/fonts/source/feta-generic.mf
|
||||
share/lilypond/${VERSION}/fonts/source/feta-macros.mf
|
||||
share/lilypond/${VERSION}/fonts/source/feta-noteheads-generic.mf
|
||||
share/lilypond/${VERSION}/fonts/source/feta-noteheads-test-generic.mf
|
||||
share/lilypond/${VERSION}/fonts/source/feta-noteheads.mf
|
||||
share/lilypond/${VERSION}/fonts/source/feta-noteheads11.mf
|
||||
share/lilypond/${VERSION}/fonts/source/feta-noteheads13.mf
|
||||
@ -102,6 +110,7 @@ share/lilypond/${VERSION}/fonts/source/feta-test16.mf
|
||||
share/lilypond/${VERSION}/fonts/source/feta-test20.mf
|
||||
share/lilypond/${VERSION}/fonts/source/feta-test23.mf
|
||||
share/lilypond/${VERSION}/fonts/source/feta-test26.mf
|
||||
share/lilypond/${VERSION}/fonts/source/feta-ties.mf
|
||||
share/lilypond/${VERSION}/fonts/source/feta-timesignatures.mf
|
||||
share/lilypond/${VERSION}/fonts/source/feta-trills.mf
|
||||
share/lilypond/${VERSION}/fonts/source/feta11.mf
|
||||
@ -119,7 +128,16 @@ share/lilypond/${VERSION}/fonts/source/parmesan-dots.mf
|
||||
share/lilypond/${VERSION}/fonts/source/parmesan-flags.mf
|
||||
share/lilypond/${VERSION}/fonts/source/parmesan-generic.mf
|
||||
share/lilypond/${VERSION}/fonts/source/parmesan-macros.mf
|
||||
share/lilypond/${VERSION}/fonts/source/parmesan-noteheads-generic.mf
|
||||
share/lilypond/${VERSION}/fonts/source/parmesan-noteheads.mf
|
||||
share/lilypond/${VERSION}/fonts/source/parmesan-noteheads11.mf
|
||||
share/lilypond/${VERSION}/fonts/source/parmesan-noteheads13.mf
|
||||
share/lilypond/${VERSION}/fonts/source/parmesan-noteheads14.mf
|
||||
share/lilypond/${VERSION}/fonts/source/parmesan-noteheads16.mf
|
||||
share/lilypond/${VERSION}/fonts/source/parmesan-noteheads18.mf
|
||||
share/lilypond/${VERSION}/fonts/source/parmesan-noteheads20.mf
|
||||
share/lilypond/${VERSION}/fonts/source/parmesan-noteheads23.mf
|
||||
share/lilypond/${VERSION}/fonts/source/parmesan-noteheads26.mf
|
||||
share/lilypond/${VERSION}/fonts/source/parmesan-rests.mf
|
||||
share/lilypond/${VERSION}/fonts/source/parmesan-scripts.mf
|
||||
share/lilypond/${VERSION}/fonts/source/parmesan-timesignatures.mf
|
||||
@ -159,6 +177,7 @@ share/lilypond/${VERSION}/ly/bagpipe.ly
|
||||
share/lilypond/${VERSION}/ly/catalan.ly
|
||||
share/lilypond/${VERSION}/ly/chord-modifiers-init.ly
|
||||
share/lilypond/${VERSION}/ly/chord-repetition-init.ly
|
||||
share/lilypond/${VERSION}/ly/context-mods-init.ly
|
||||
share/lilypond/${VERSION}/ly/declarations-init.ly
|
||||
share/lilypond/${VERSION}/ly/deutsch.ly
|
||||
share/lilypond/${VERSION}/ly/drumpitch-init.ly
|
||||
@ -166,6 +185,7 @@ share/lilypond/${VERSION}/ly/dynamic-scripts-init.ly
|
||||
share/lilypond/${VERSION}/ly/english.ly
|
||||
share/lilypond/${VERSION}/ly/engraver-init.ly
|
||||
share/lilypond/${VERSION}/ly/espanol.ly
|
||||
share/lilypond/${VERSION}/ly/event-listener.ly
|
||||
share/lilypond/${VERSION}/ly/festival.ly
|
||||
share/lilypond/${VERSION}/ly/generate-documentation.ly
|
||||
share/lilypond/${VERSION}/ly/generate-interface-doc-init.ly
|
||||
@ -191,11 +211,13 @@ share/lilypond/${VERSION}/ly/predefined-mandolin-fretboards.ly
|
||||
share/lilypond/${VERSION}/ly/predefined-ukulele-fretboards.ly
|
||||
share/lilypond/${VERSION}/ly/property-init.ly
|
||||
share/lilypond/${VERSION}/ly/scale-definitions-init.ly
|
||||
share/lilypond/${VERSION}/ly/scheme-sandbox.ly
|
||||
share/lilypond/${VERSION}/ly/script-init.ly
|
||||
share/lilypond/${VERSION}/ly/spanners-init.ly
|
||||
share/lilypond/${VERSION}/ly/string-tunings-init.ly
|
||||
share/lilypond/${VERSION}/ly/suomi.ly
|
||||
share/lilypond/${VERSION}/ly/svenska.ly
|
||||
share/lilypond/${VERSION}/ly/text-replacements.ly
|
||||
share/lilypond/${VERSION}/ly/titling-init.ly
|
||||
share/lilypond/${VERSION}/ly/toc-init.ly
|
||||
share/lilypond/${VERSION}/ly/vlaams.ly
|
||||
@ -232,9 +254,11 @@ share/lilypond/${VERSION}/python/rational.pyc
|
||||
share/lilypond/${VERSION}/python/safeeval.py
|
||||
share/lilypond/${VERSION}/python/safeeval.pyc
|
||||
share/lilypond/${VERSION}/scm/
|
||||
share/lilypond/${VERSION}/scm/accreg.scm
|
||||
share/lilypond/${VERSION}/scm/auto-beam.scm
|
||||
share/lilypond/${VERSION}/scm/autochange.scm
|
||||
share/lilypond/${VERSION}/scm/backend-library.scm
|
||||
share/lilypond/${VERSION}/scm/bar-line.scm
|
||||
share/lilypond/${VERSION}/scm/bezier-tools.scm
|
||||
share/lilypond/${VERSION}/scm/c++.scm
|
||||
share/lilypond/${VERSION}/scm/chord-entry.scm
|
||||
@ -259,6 +283,7 @@ share/lilypond/${VERSION}/scm/define-woodwind-diagrams.scm
|
||||
share/lilypond/${VERSION}/scm/display-lily.scm
|
||||
share/lilypond/${VERSION}/scm/display-woodwind-diagrams.scm
|
||||
share/lilypond/${VERSION}/scm/document-backend.scm
|
||||
share/lilypond/${VERSION}/scm/document-context-mods.scm
|
||||
share/lilypond/${VERSION}/scm/document-functions.scm
|
||||
share/lilypond/${VERSION}/scm/document-identifiers.scm
|
||||
share/lilypond/${VERSION}/scm/document-markup.scm
|
||||
@ -288,6 +313,7 @@ share/lilypond/${VERSION}/scm/lily-library.scm
|
||||
share/lilypond/${VERSION}/scm/lily-sort.scm
|
||||
share/lilypond/${VERSION}/scm/lily.scm
|
||||
share/lilypond/${VERSION}/scm/ly-syntax-constructors.scm
|
||||
share/lilypond/${VERSION}/scm/markup-macros.scm
|
||||
share/lilypond/${VERSION}/scm/markup.scm
|
||||
share/lilypond/${VERSION}/scm/memory-trace.scm
|
||||
share/lilypond/${VERSION}/scm/midi.scm
|
||||
@ -306,12 +332,16 @@ share/lilypond/${VERSION}/scm/part-combiner.scm
|
||||
share/lilypond/${VERSION}/scm/predefined-fretboards.scm
|
||||
share/lilypond/${VERSION}/scm/ps-to-png.scm
|
||||
share/lilypond/${VERSION}/scm/safe-lily.scm
|
||||
share/lilypond/${VERSION}/scm/safe-utility-defs.scm
|
||||
share/lilypond/${VERSION}/scm/scheme-engravers.scm
|
||||
share/lilypond/${VERSION}/scm/script.scm
|
||||
share/lilypond/${VERSION}/scm/skyline.scm
|
||||
share/lilypond/${VERSION}/scm/song-util.scm
|
||||
share/lilypond/${VERSION}/scm/song.scm
|
||||
share/lilypond/${VERSION}/scm/standalone.scm
|
||||
share/lilypond/${VERSION}/scm/stencil.scm
|
||||
share/lilypond/${VERSION}/scm/tablature.scm
|
||||
share/lilypond/${VERSION}/scm/text.scm
|
||||
share/lilypond/${VERSION}/scm/time-signature-settings.scm
|
||||
share/lilypond/${VERSION}/scm/titling.scm
|
||||
share/lilypond/${VERSION}/scm/to-xml.scm
|
||||
@ -332,10 +362,12 @@ share/lilypond/${VERSION}/vim/syntax/
|
||||
share/lilypond/${VERSION}/vim/syntax/lilypond-words
|
||||
share/lilypond/${VERSION}/vim/syntax/lilypond-words.vim
|
||||
share/lilypond/${VERSION}/vim/syntax/lilypond.vim
|
||||
share/locale/ca/LC_MESSAGES/lilypond.mo
|
||||
share/locale/cs/LC_MESSAGES/lilypond.mo
|
||||
share/locale/da/LC_MESSAGES/lilypond.mo
|
||||
share/locale/de/LC_MESSAGES/lilypond.mo
|
||||
share/locale/el/LC_MESSAGES/lilypond.mo
|
||||
share/locale/eo/LC_MESSAGES/lilypond.mo
|
||||
share/locale/es/LC_MESSAGES/lilypond.mo
|
||||
share/locale/fi/LC_MESSAGES/lilypond.mo
|
||||
share/locale/fr/LC_MESSAGES/lilypond.mo
|
||||
|
Loading…
Reference in New Issue
Block a user