Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13146
Modified Files:
lilypond.info lilypond.patch
Log Message:
Latest upstream version
Index: lilypond.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/lilypond.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lilypond.info 7 Feb 2006 15:38:08 -0000 1.1
+++ lilypond.info 24 Mar 2006 23:59:51 -0000 1.2
@@ -1,24 +1,34 @@
Package: lilypond
-Version: 2.6.4
+Version: 2.8.0
Revision: 1001
Maintainer: Matthias Neeracher <[EMAIL PROTECTED]>
GCC: 4.0
-BuildDepends: readline (>= 4.3-1028), guile16-dev (>= 1.6.7-1010),
libkpathsea4 | system-tetex, flex, libgettext3-dev, gettext-bin, gettext-tools,
texinfo (>= 4.8-2), mftrace (>= 1.1.11-1), freetype219 (>= 2.1.9-1),
pango1-xft2-ft219-dev (>= 1.8.1-5), glib2-dev, bison (>= 2.0-1),
fontconfig2-dev (>= 2.2.3-10), expat, pkgconfig
-Depends: python23 (>= 1:2.3.5-1124) | python23-nox (>= 1:2.3.4-1104), guile16
(>= 1.6.7-1010), tetex-base (>= 3.0-1), ec-fonts-mftraced (>= 1.0.9-1),
ghostscript (>= 8.15-1), freetype219-shlibs (>= 2.1.9-1), pango1-xft2-ft219 (>=
1.8.1-5), fc-ghostscript-fonts, fontconfig2-shlibs, fondu
-BuildConflicts: freetype
-Conflicts: lilypond-devel, lilypond-unstable
+BuildDepends: <<
+guile16-dev (>= 1.6.7-1010), libkpathsea4 | system-tetex,
+flex, libgettext3-dev, gettext-bin, gettext-tools, texinfo (>= 4.8-2),
+mftrace (>= 1.1.19-1001), freetype219 (>= 2.1.9-1),
+pango1-xft2-ft219-dev (>= 1.8.1-5), glib2-dev, bison (>= 2.0-1),
+fontconfig2-dev (>= 2.2.3-10), expat, pkgconfig
+<<
+Depends: <<
+python24 (>= 1:2.4.2-1005), guile16 (>= 1.6.7-1010), ghostscript (>= 8.15-1),
+freetype219-shlibs (>= 2.1.9-1), pango1-xft2-ft219 (>= 1.8.1-5),
+fc-ghostscript-fonts, fontconfig2-shlibs, fondu, libkpathsea4-shlibs,
+tetex-base (>= 3.0-1), ec-fonts-mftraced (>= 1.0.9-1)
+<<
+Conflicts: lilypond, lilypond-unstable, lilypond-devel, lilypond-devel-tex
Replaces: lilypond-devel, lilypond-unstable
-Source: http://www.lilypond.org/ftp/v2.6/lilypond-%v.tar.gz
-Source-MD5: b2df3f75851e7ef3e264570feaa52aa6
+Source: http://www.lilypond.org/ftp/v2.8/lilypond-%v.tar.gz
+Source-MD5: 44d0b8389c45d14826f38900bb0fd983
Patch: %n.patch
SetCPPFLAGS: -no-cpp-precomp
SetLDFLAGS: -lexpat -L%p/lib/pango-ft219/lib
-SetCXX: c++
-ConfigureParams: --infodir='$(prefix)/share/info'
--mandir='$(prefix)/share/man' --disable-gui
+SetCXX: c++-3.3
+ConfigureParams: --infodir='$(prefix)/share/info'
--mandir='$(prefix)/share/man' --with-ncsb-dir='%p/share/ghostscript/fonts'
--disable-gui
CompileScript: <<
PREFIX=%p ./lexer-gcc-3.1.sh
./autogen.sh --noconf
-PKG_CONFIG_PATH=%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig
PYTHON=%p/bin/python2.3 GUILE=%p/bin/guile-1.6 GUILE_CONFIG=guile-1.6-config
./configure %c
+PKG_CONFIG_PATH=%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig
PYTHON=%p/bin/python2.4 GUILE=%p/bin/guile-1.6 GUILE_CONFIG=guile-1.6-config
./configure %c
mkdir mf/out
gnumake
<<
Index: lilypond.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/lilypond.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lilypond.patch 7 Feb 2006 15:38:08 -0000 1.1
+++ lilypond.patch 24 Mar 2006 23:59:51 -0000 1.2
@@ -1,31 +1,10 @@
-diff -ruN lilypond-2.5.28-orig/Documentation/user/GNUmakefile
lilypond-2.5.28/Documentation/user/GNUmakefile
---- lilypond-2.5.28-orig/Documentation/user/GNUmakefile 2005-06-07
00:20:25.000000000 -0700
-+++ lilypond-2.5.28/Documentation/user/GNUmakefile 2005-06-07
00:20:57.000000000 -0700
-@@ -277,7 +277,7 @@
- local-clean: local-delete
-
- local-delete:
-- -for i in $$(seq 0 9); do \
-+ -for i in $$(jot 9 0 9); do \
- for j in dvi eps eps.bbox eps.trans eps.trans.ps ps log png
tex; do \
- rm -f $(outdir)/lily-$$i*$$j; \
- done; \
-diff -ruN lilypond-2.5.28-orig/Documentation/user/lilypond.tely
lilypond-2.5.28/Documentation/user/lilypond.tely
---- lilypond-2.5.28-orig/Documentation/user/lilypond.tely 2005-06-07
00:20:25.000000000 -0700
-+++ lilypond-2.5.28/Documentation/user/lilypond.tely 2005-06-07
00:20:57.000000000 -0700
-@@ -7,7 +7,6 @@
-
- @dircategory GNU music project
- @direntry
--
- @ignore
- (I think)
- Current version of the manual: 2.5.18
-@@ -32,15 +31,14 @@
+diff -ruN lilypond-2.7.37-orig/Documentation/user/lilypond.tely
lilypond-2.7.37/Documentation/user/lilypond.tely
+--- lilypond-2.7.37-orig/Documentation/user/lilypond.tely 2006-03-03
13:48:33.000000000 -0800
++++ lilypond-2.7.37/Documentation/user/lilypond.tely 2006-03-03
13:48:51.000000000 -0800
+@@ -33,13 +33,13 @@
@c LilyPond program.
@end ignore
--
-* LilyPond: (lilypond/lilypond). The GNU music typesetter.
-* abc2ly: (lilypond/lilypond)Invoking abc2ly. Importing ABC.
-* convert-ly: (lilypond/lilypond)Invoking convert-ly. Older LilyPond
versions.
@@ -33,7 +12,6 @@
-* lilypond-book: (lilypond/lilypond)LilyPond-book. Itegrating text and
music.
-* midi2ly: (lilypond/lilypond)Invoking midi2ly. Importing MIDI.
-* mup2ly: (lilypond/lilypond)Invoking mup2ly. Importing Mup.
--* musedata2ly: (lilypond/lilypond)Invoking musedata2ly. Importing
MuseData.
+* LilyPond: (lilypond). The GNU music typesetter.
+* abc2ly: (lilypond)Invoking abc2ly. Importing ABC.
+* convert-ly: (lilypond)Invoking convert-ly. Older LilyPond versions.
@@ -41,15 +19,14 @@
+* lilypond-book: (lilypond)LilyPond-book. Itegrating text and music.
+* midi2ly: (lilypond)Invoking midi2ly. Importing MIDI.
+* mup2ly: (lilypond)Invoking mup2ly. Importing Mup.
-+* musedata2ly: (lilypond)Invoking musedata2ly. Importing MuseData.
@end direntry
-diff -ruN lilypond-2.5.28-orig/Documentation/user/music-glossary.tely
lilypond-2.5.28/Documentation/user/music-glossary.tely
---- lilypond-2.5.28-orig/Documentation/user/music-glossary.tely
2005-06-07 00:20:25.000000000 -0700
-+++ lilypond-2.5.28/Documentation/user/music-glossary.tely 2005-06-07
00:20:57.000000000 -0700
-@@ -16,6 +16,11 @@
- and as @uref{source/Documentation/user/out-www/music-glossary.html,one big
page}.
+diff -ruN lilypond-2.7.37-orig/Documentation/user/music-glossary.tely
lilypond-2.7.37/Documentation/user/music-glossary.tely
+--- lilypond-2.7.37-orig/Documentation/user/music-glossary.tely
2006-03-03 13:48:33.000000000 -0800
++++ lilypond-2.7.37/Documentation/user/music-glossary.tely 2006-03-03
13:48:51.000000000 -0800
+@@ -15,6 +15,11 @@
+ and as @uref{source/Documentation/user/music-glossary.html,one big page}.
@end ifhtml
[EMAIL PROTECTED] GNU music project
@@ -60,11 +37,20 @@
@titlepage
@title Music Glossary
@author Christian Mondrup @c Original author of LilyPond glossary
-diff -ruN lilypond-2.5.28-orig/config.make.in lilypond-2.5.28/config.make.in
---- lilypond-2.5.28-orig/config.make.in 2005-06-07 00:20:29.000000000
-0700
-+++ lilypond-2.5.28/config.make.in 2005-06-07 00:20:57.000000000 -0700
-@@ -41,7 +41,7 @@
- elispdir = $(datadir)/emacs/site-lisp
+diff -ruN lilypond-2.7.37-orig/config.make.in lilypond-2.7.37/config.make.in
+--- lilypond-2.7.37-orig/config.make.in 2006-03-03 13:48:35.000000000
-0800
++++ lilypond-2.7.37/config.make.in 2006-03-03 13:48:51.000000000 -0800
+@@ -28,7 +28,7 @@
+ FREETYPE2_LIBS = @FREETYPE2_LIBS@
+ PANGO_FT2_LIBS = @PANGO_FT2_LIBS@
+
+-CONFIG_LIBS = @LIBS@ @EXTRA_LIBS@ $(GUILE_LIBS) $(PANGO_FT2_LIBS)
$(FONTCONFIG_LIBS) $(FREETYPE2_LIBS)
++CONFIG_LIBS = @LIBS@ @EXTRA_LIBS@ $(PANGO_FT2_LIBS) $(FONTCONFIG_LIBS)
$(FREETYPE2_LIBS) $(GUILE_LIBS)
+ CONFIG_LDFLAGS = @LDFLAGS@
+
+ PACKAGE = @PACKAGE@
+@@ -65,7 +65,7 @@
+ stepmake = @stepmake@
package_datadir = $(datadir)/$(package)
-package_infodir = $(infodir)/$(package)
@@ -72,35 +58,26 @@
package_libdir = $(libdir)/$(package)
package_docdir = $(docdir)/$(package)
package_omfdir = $(omfdir)/$(package)
-diff -ruN lilypond-2.5.28-orig/stepmake/stepmake/c++-rules.make
lilypond-2.5.28/stepmake/stepmake/c++-rules.make
---- lilypond-2.5.28-orig/stepmake/stepmake/c++-rules.make 2005-06-07
00:20:28.000000000 -0700
-+++ lilypond-2.5.28/stepmake/stepmake/c++-rules.make 2005-06-07
00:20:57.000000000 -0700
-@@ -26,6 +26,7 @@
+diff -ruN lilypond-2.7.37-orig/stepmake/stepmake/c++-rules.make
lilypond-2.7.37/stepmake/stepmake/c++-rules.make
+--- lilypond-2.7.37-orig/stepmake/stepmake/c++-rules.make 2006-03-03
13:48:34.000000000 -0800
++++ lilypond-2.7.37/stepmake/stepmake/c++-rules.make 2006-03-03
13:49:30.000000000 -0800
+@@ -17,6 +17,7 @@
$(outdir)/%.cc: %.ll
- $(FLEX) -Cfe -p -p -o$@ $<
+ $(FLEX) -Cfe -p -p -o$@ $<
+ perl -i.bak -pe 's/^class istream;/#include <iostream>;\nusing
namespace std;/' $@
$(outdir)/%-rc.o: $(outdir)/%.rc
$(WINDRES) $(WINDRES_FLAGS) -o$@ $<
-diff -ruN lilypond-2.5.28-orig/stepmake/stepmake/c-vars.make
lilypond-2.5.28/stepmake/stepmake/c-vars.make
---- lilypond-2.5.28-orig/stepmake/stepmake/c-vars.make 2005-06-07
00:20:28.000000000 -0700
-+++ lilypond-2.5.28/stepmake/stepmake/c-vars.make 2005-06-07
00:20:57.000000000 -0700
-@@ -14,4 +14,4 @@
-
- ALL_C_SOURCES += $(H_FILES) $(C_FILES) $(Y_FILES) $(L_FILES)
-
--ALL_CFLAGS = $(CFLAGS) $(ICFLAGS) $(DEFINES) $(addprefix -I,$(INCLUDES))
$(USER_CFLAGS) $(EXTRA_CFLAGS) $(MODULE_CFLAGS)
-+ALL_CFLAGS = $(CFLAGS) $(CPPFLAGS) $(ICFLAGS) $(DEFINES) $(addprefix
-I,$(INCLUDES)) $(USER_CFLAGS) $(EXTRA_CFLAGS) $(MODULE_CFLAGS)
-diff -ruN lilypond-2.5.28-orig/stepmake/stepmake/compile-vars.make
lilypond-2.5.28/stepmake/stepmake/compile-vars.make
---- lilypond-2.5.28-orig/stepmake/stepmake/compile-vars.make 2005-06-07
00:20:28.000000000 -0700
-+++ lilypond-2.5.28/stepmake/stepmake/compile-vars.make 2005-06-07
00:20:57.000000000 -0700
-@@ -3,7 +3,7 @@
- ALL_LDFLAGS = $(LDFLAGS) $(ILDFLAGS) $(EXTRA_LDFLAGS) $($(PACKAGE)_LDFLAGS)
$(MODULE_LDFLAGS) $(USER_LDFLAGS)
+diff -ruN lilypond-2.7.37-orig/stepmake/stepmake/compile-vars.make
lilypond-2.7.37/stepmake/stepmake/compile-vars.make
+--- lilypond-2.7.37-orig/stepmake/stepmake/compile-vars.make 2006-03-03
13:48:34.000000000 -0800
++++ lilypond-2.7.37/stepmake/stepmake/compile-vars.make 2006-03-03
13:48:51.000000000 -0800
+@@ -4,7 +4,7 @@
PIC_FLAGS = -fpic -fPIC
+ ifeq ($(MINGW_BUILD),)
-SHARED_FLAGS = -shared
+SHARED_FLAGS = -bundle -flat_namespace -undefined suppress
-
- o-dep-out = $(outdir)/$(subst .o,.dep,$(notdir $@))#
- DO_O_DEP = rm -f $(o-dep-out); DEPENDENCIES_OUTPUT="$(o-dep-out)
$(outdir)/$(notdir $@)"
+ else
+ SHARED_FLAGS = -mdll
+ endif
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
