6 files changed, 14 insertions, 52 deletions
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index 14a6a9edc1b..09f9868949f 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2006/09/11 08:33:11 joerg Exp $
+# $NetBSD: Makefile,v 1.50 2006/12/29 07:11:55 obache Exp $
 #
 
-DISTNAME=	lilypond-2.4.3
-PKGREVISION=	5
+DISTNAME=	lilypond-2.4.6
 CATEGORIES=	print
 MASTER_SITES=	http://lilypond.org/download/v2.4/
 
diff --git a/print/lilypond/PLIST b/print/lilypond/PLIST
index a572b318548..24611a3a34f 100644
--- a/print/lilypond/PLIST
+++ b/print/lilypond/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2006/04/17 07:07:32 jlam Exp $
+@comment $NetBSD: PLIST,v 1.11 2006/12/29 07:11:55 obache Exp $
 bin/abc2ly
 bin/convert-ly
 bin/etf2ly
@@ -27,7 +27,8 @@ ${EMACS_LISPPREFIX}/lilypond-init.el
 ${EMACS_LISPPREFIX}/lilypond-mode.el
 ${EMACS_LISPPREFIX}/lilypond-what-beat.el
 ${EMACS_LISPPREFIX}/lilypond-words.el
-share/lilypond/${PKGVERSION}/dvips/lilypond.map
+share/lilypond/${PKGVERSION}/dvips/map
+share/lilypond/${PKGVERSION}/dvips/ps
 share/lilypond/${PKGVERSION}/fonts/afm/feta-braces-a.afm
 share/lilypond/${PKGVERSION}/fonts/afm/feta-braces-b.afm
 share/lilypond/${PKGVERSION}/fonts/afm/feta-braces-c.afm
@@ -68,6 +69,8 @@ share/lilypond/${PKGVERSION}/fonts/afm/parmesan18.afm
 share/lilypond/${PKGVERSION}/fonts/afm/parmesan20.afm
 share/lilypond/${PKGVERSION}/fonts/afm/parmesan23.afm
 share/lilypond/${PKGVERSION}/fonts/afm/parmesan26.afm
+share/lilypond/${PKGVERSION}/fonts/enc/latin1.enc
+share/lilypond/${PKGVERSION}/fonts/map/lilypond.map
 share/lilypond/${PKGVERSION}/fonts/source/feta-accordion.mf
 share/lilypond/${PKGVERSION}/fonts/source/feta-autometric.mf
 share/lilypond/${PKGVERSION}/fonts/source/feta-banier.mf
@@ -439,6 +442,7 @@ share/lilypond/${PKGVERSION}/scm/to-xml.scm
 share/lilypond/${PKGVERSION}/scm/translation-functions.scm
 share/lilypond/${PKGVERSION}/scripts/lilypond-login
 share/lilypond/${PKGVERSION}/scripts/lilypond-profile
+share/lilypond/${PKGVERSION}/tex/enc
 share/lilypond/${PKGVERSION}/tex/feta-braces-a.tex
 share/lilypond/${PKGVERSION}/tex/feta-braces-b.tex
 share/lilypond/${PKGVERSION}/tex/feta-braces-c.tex
@@ -472,7 +476,6 @@ share/lilypond/${PKGVERSION}/tex/feta20.tex
 share/lilypond/${PKGVERSION}/tex/feta23.tex
 share/lilypond/${PKGVERSION}/tex/feta26.tex
 share/lilypond/${PKGVERSION}/tex/headers.tex
-share/lilypond/${PKGVERSION}/tex/latin1.enc
 share/lilypond/${PKGVERSION}/tex/lily-debug.tex
 share/lilypond/${PKGVERSION}/tex/lily-pdf-defs.tex
 share/lilypond/${PKGVERSION}/tex/lily-ps-defs.tex
@@ -537,6 +540,8 @@ share/omf/lilypond/${PKGVERSION}/music-glossary.ps.gz.omf
 @dirrm share/lilypond/${PKGVERSION}/fonts/type1
 @dirrm share/lilypond/${PKGVERSION}/fonts/tfm
 @dirrm share/lilypond/${PKGVERSION}/fonts/source
+@dirrm share/lilypond/${PKGVERSION}/fonts/map
+@dirrm share/lilypond/${PKGVERSION}/fonts/enc
 @dirrm share/lilypond/${PKGVERSION}/fonts/afm
 @dirrm share/lilypond/${PKGVERSION}/fonts
 @dirrm share/lilypond/${PKGVERSION}/dvips
diff --git a/print/lilypond/distinfo b/print/lilypond/distinfo
index 74ca629681f..6d20346f6e5 100644
--- a/print/lilypond/distinfo
+++ b/print/lilypond/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 12:51:43 agc Exp $
+$NetBSD: distinfo,v 1.8 2006/12/29 07:11:55 obache Exp $
 
-SHA1 (lilypond-2.4.3.tar.gz) = 3b4d13d53b6a8a87ed34aabf254d479bebe7c9e0
-RMD160 (lilypond-2.4.3.tar.gz) = 0958e9e90d433cb850d3c5d0299477d77f60c6fd
-Size (lilypond-2.4.3.tar.gz) = 2018104 bytes
-SHA1 (patch-aa) = 1a0f6fe725bff229df1fe0fc21363efd999e1002
-SHA1 (patch-ab) = 1d9032b1d103367e9bc583b7f352cd77144e985d
-SHA1 (patch-ac) = 06bbb991e5ae7edb199f7c1f5b1c7067b4f73f7d
+SHA1 (lilypond-2.4.6.tar.gz) = 90ed2ce0e4e537cc32005db6a4881b48760bff81
+RMD160 (lilypond-2.4.6.tar.gz) = 9806e54b946b15bc3fc8c575852af35bbd59279a
+Size (lilypond-2.4.6.tar.gz) = 2055425 bytes
diff --git a/print/lilypond/patches/patch-aa b/print/lilypond/patches/patch-aa
deleted file mode 100644
index d2653eb48a0..00000000000
--- a/print/lilypond/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 959e549be46..00000000000
--- a/print/lilypond/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 7b53b22a933..00000000000
--- a/print/lilypond/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$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