Add some patches to make this work with mftrace>1.1, and

depend on it.

5 files changed, 46 insertions, 2 deletions

diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index 793ea31b6d3..c12b37b95d7 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2004/12/30 08:19:05 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2004/12/31 20:58:44 wiz Exp $
 #
 
 DISTNAME=	lilypond-2.4.3
@@ -12,6 +12,8 @@ COMMENT=	GNU Music Typesetter
 DEPENDS+=	ec-fonts-mftraced-[0-9]*:../../fonts/ec-fonts-mftraced
 BUILD_DEPENDS+=	bison>=1.875nb1:../../devel/bison
 
+BUILDLINK_DEPENDS.mftrace+=	mftrace>=1.1.0
+
 GNU_CONFIGURE=		YES
 USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/print/lilypond/distinfo b/print/lilypond/distinfo
index bd104f9464f..3be4c583b3d 100644
--- a/print/lilypond/distinfo
+++ b/print/lilypond/distinfo
@@ -1,4 +1,7 @@
-$NetBSD: distinfo,v 1.5 2004/12/30 05:11:57 dmcmahill Exp $
+$NetBSD: distinfo,v 1.6 2004/12/31 20:58:44 wiz Exp $
 
 SHA1 (lilypond-2.4.3.tar.gz) = 3b4d13d53b6a8a87ed34aabf254d479bebe7c9e0
 Size (lilypond-2.4.3.tar.gz) = 2018104 bytes
+SHA1 (patch-aa) = 1a0f6fe725bff229df1fe0fc21363efd999e1002
+SHA1 (patch-ab) = 1d9032b1d103367e9bc583b7f352cd77144e985d
+SHA1 (patch-ac) = 06bbb991e5ae7edb199f7c1f5b1c7067b4f73f7d
diff --git a/print/lilypond/patches/patch-aa b/print/lilypond/patches/patch-aa
new file mode 100644
index 00000000000..d2653eb48a0
--- /dev/null
+++ b/print/lilypond/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.5 2004/12/31 20:58:44 wiz Exp $
+
+--- buildscripts/builder.py.orig	2004-10-08 23:39:37.000000000 +0000
++++ buildscripts/builder.py
+@@ -211,7 +211,7 @@ def add_enc_src (target, source, env):
+ a = 'cd ${TARGET.dir} && \
+ if test -e ${SOURCE.filebase}.enc; then encoding="--encoding=${SOURCE.filebase}.enc"; fi; \
+ MFINPUTS=$srcdir/mf:.: \
+-mftrace --pfa --simplify --keep-trying $$encoding $TOO__verbose \
++mftrace --formats=pfa --simplify --keep-trying $$encoding $TOO__verbose \
+ --include=${TARGET.dir} \
+ ${SOURCE.file}'
+ 
diff --git a/print/lilypond/patches/patch-ab b/print/lilypond/patches/patch-ab
new file mode 100644
index 00000000000..959e549be46
--- /dev/null
+++ b/print/lilypond/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2004/12/31 20:58:44 wiz Exp $
+
+--- mf/GNUmakefile.orig	2004-11-08 19:49:16.000000000 +0000
++++ mf/GNUmakefile
+@@ -208,7 +208,7 @@ $(SAUTER_FONTS:%=$(outdir)/%.bla):
+ 	$(foreach i, $@, touch $i && ) true
+ 
+ $(outdir)/%.pfa: $(outdir)/%.bla
+-	$(MFTRACE) -I $(outdir)/ --pfa --simplify --keep-trying $(notdir $(basename $@))  && mv $(notdir $@) $(outdir)/
++	$(MFTRACE) -I $(outdir)/ --formats=pfa --simplify --keep-trying $(notdir $(basename $@))  && mv $(notdir $@) $(outdir)/
+ 
+ $(outdir)/%.enc.in: %.enc
+ 	cp $< $@
diff --git a/print/lilypond/patches/patch-ac b/print/lilypond/patches/patch-ac
new file mode 100644
index 00000000000..7b53b22a933
--- /dev/null
+++ b/print/lilypond/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2004/12/31 20:58:44 wiz Exp $
+
+--- stepmake/stepmake/metafont-rules.make.orig	2004-07-31 10:15:54.000000000 +0000
++++ stepmake/stepmake/metafont-rules.make
+@@ -30,7 +30,7 @@ $(outdir)/%.$(XPM_RESOLUTION)pk: $(outdi
+ 
+ 
+ $(outdir)/%.pfa: %.mf
+-	$(MFTRACE) $(MFTRACE_FLAGS) -I $(outdir)/ --pfa --simplify $(basename $(@F))
++	$(MFTRACE) $(MFTRACE_FLAGS) -I $(outdir)/ --formats=pfa --simplify $(basename $(@F))
+ 	mv $(basename $(@F)).pfa $(outdir)
+ 
+ $(outdir)/%.pfb: %.mf