--- mf/GNUmakefile.orig Tue Mar 9 12:48:01 2004 +++ mf/GNUmakefile Wed Jun 23 23:51:36 2004 @@ -88,18 +88,18 @@ pfa_warning: ifneq ($(notdir $(MFTRACE)),mftrace) @echo "" - @echo "ERROR: mftrace not found" + @echo "INFO: mftrace not found" @echo "" @echo "For obtaining PFA fonts, either install mftrace " @echo "(see http://www.xs4all.nl/~hanwen/mftrace/ )," - @echo "or try one of the following commands in this directory: " + @echo "or try one of the following commands in /usr/ports/print/lilypond/work/lilypond-$(TOPLEVEL_VERSION)" @echo "" - @echo " make get-pfa " - @echo " make get-rpm-pfa " - @echo " make get-deb-pfa " + @echo " gmake get-pfa " + @echo " gmake get-rpm-pfa " + @echo " gmake get-deb-pfa " @echo "" @echo "These commands will try to download the files from the internet." - @false + @sleep 20 endif @@ -118,7 +118,8 @@ redhat-package=lilypond-$(TOPLEVEL_VERSION)-1.i386.rpm $(outdir)/$(redhat-package): - wget --passive-ftp -P $(outdir) http://lilypond.org/download/binaries/RedHat-9/$(redhat-package) + cp ${DISTDIR}/$(redhat-package) $(outdir) + #wget --passive-ftp -P $(outdir) http://lilypond.org/download/binaries/RedHat-9/$(redhat-package) get-rpm-pfa: $(outdir)/$(redhat-package) cd $(outdir) ; rm -rf usr/ # (root alert!)