Date: Tue, 12 Jul 2005 10:04:52 +1000 From: Dave Symonds <dasymond@it.usyd.edu.au> To: FreeBSD-gnats-submit@FreeBSD.org Cc: lioux@FreeBSD.org Subject: ports/83306: [patch] print/lilypond 2.4.6 Message-ID: <20050712000451.GA17192@it.usyd.edu.au> Resent-Message-ID: <200507120010.j6C0AId2008374@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 83306 >Category: ports >Synopsis: [patch] print/lilypond 2.4.6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Jul 12 00:10:17 GMT 2005 >Closed-Date: >Last-Modified: >Originator: David Symonds >Release: FreeBSD 5.4-RELEASE i386 >Organization: >Environment: System: FreeBSD voltron 5.4-RELEASE FreeBSD 5.4-RELEASE #0: Sun May 8 10:21:06 UTC 2005 root@harlow.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386 >Description: update port to current version >How-To-Repeat: >Fix: note new file lilypond/files/patch-buildscripts:lilypond-profile.sh, and removal of a couple of files --- ports-lilypond-2.4.6.diff begins here --- diff -ruN lilypond.orig/Makefile lilypond/Makefile --- lilypond.orig/Makefile Wed Jun 29 00:15:10 2005 +++ lilypond/Makefile Sun Jul 10 12:26:22 2005 @@ -1,6 +1,6 @@ -# New ports collection makefile for: lilypond-devel -# Date created: 2001-02-10 -# Whom: patrick +# New ports collection makefile for: lilypond +# Date created: 2005-07-10 +# Whom: dsymonds@gmail.com # based on print/lilypond originally by trevor # # $FreeBSD: ports/print/lilypond/Makefile,v 1.27 2005/05/20 06:11:47 lioux Exp $ @@ -8,15 +8,17 @@ # PORTNAME= lilypond -PORTVERSION= 2.2.2 -CATEGORIES= print audio -MASTER_SITES= http://lilypond.org/download/v2.2/ +PORTVERSION= 2.4.6 +CATEGORIES= print +MASTER_SITES= http://lilypond.org/download/v2.4/ MAINTAINER= lioux@FreeBSD.org COMMENT= The GNU music typesetter BUILD_DEPENDS= latex:${PORTSDIR}/print/teTeX \ - scrollkeeper-install:${PORTSDIR}/textproc/scrollkeeper + scrollkeeper-install:${PORTSDIR}/textproc/scrollkeeper \ + mftrace:${PORTSDIR}/print/mftrace \ + ec-fonts-mftraced:${PORTSDIR}/print/ec-fonts-mftraced LIB_DEPENDS= guile.15:${PORTSDIR}/lang/guile RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX @@ -25,14 +27,15 @@ INFO= lilypond lilypond-internals \ music-glossary -CONFLICTS= lilypond-2.* +#CONFLICTS= lilypond-2.* -#INSTALLS_SHLIB not needed for phyton library midi.so +#INSTALLS_SHLIB not needed for python library midi.so GNU_CONFIGURE= yes USE_BISON= yes USE_GMAKE= YES USE_PYTHON= YES +INSTALLS_OMF= yes MAKEFILE= GNUmakefile PKGINSTALL= ${WRKDIR}/pkg-install @@ -41,13 +44,6 @@ --infodir=${PREFIX}/info CONFIGURE_ENV+= "CPPFLAGS=${CPPFLAGS}" -.if defined(WITH_SELFBUILT_FONTS) -BUILD_DEPENDS+= mftrace:${PORTSDIR}/print/mftrace -.else -BUILD_DEPENDS+= wget:${PORTSDIR}/ftp/wget -BUILD_DEPENDS+= rpm2cpio:${PORTSDIR}/archivers/rpm -.endif - # inform kpathsea.h of getopt-prototype version CFLAGS+= -D__GNU_LIBRARY__ CPPFLAGS+= -I${WRKSRC}/lily/out @@ -56,9 +52,9 @@ .include <bsd.port.pre.mk> ALL_TARGET= all -.if ${OSVERSION} >= 502120 -BROKEN= "Does not compile on FreeBSD >= 5.x" -.endif +#.if ${OSVERSION} >= 502120 +#BROKEN= "Does not compile on FreeBSD >= 5.x" +#.endif .if ${OSVERSION} < 500000 USE_GCC= 3.4 @@ -70,6 +66,7 @@ PLIST_SUB+= CONDITIONAL="@comment " EXTRA_PATCHES+= ${FILESDIR}/extra-patch:GNUmakefile.in .else +BUILD_DEPENDS+= texinfo:${PORTSDIR}/print/texinfo PLIST_SUB+= CONDITIONAL="" .endif PLIST_SUB+= PORTVERSION=${PORTVERSION} @@ -82,11 +79,6 @@ < ${FILESDIR}/pkg-install.in \ | ${SED} -e "s=${PREFIX}=\$${PKG_PREFIX}=g" \ > ${PKGINSTALL} - -.if !defined(WITH_SELFBUILT_FONTS) -post-configure: - cd ${WRKSRC} && ${GMAKE} -C mf get-pfa -.endif post-install: .if !defined(NOPORTDOCS) diff -ruN lilypond.orig/distinfo lilypond/distinfo --- lilypond.orig/distinfo Wed Jun 16 09:12:15 2004 +++ lilypond/distinfo Sun Jul 10 11:49:44 2005 @@ -1,2 +1,2 @@ -MD5 (lilypond-2.2.2.tar.gz) = 1f9ed6b5a80533ce6c960c889fa51226 -SIZE (lilypond-2.2.2.tar.gz) = 1900426 +MD5 (lilypond-2.4.6.tar.gz) = 0f69cfb3cd6a2628653139202121bde7 +SIZE (lilypond-2.4.6.tar.gz) = 2055425 diff -ruN lilypond.orig/files/patch-Documentation:usr:lilypond.tely lilypond/files/patch-Documentation:usr:lilypond.tely --- lilypond.orig/files/patch-Documentation:usr:lilypond.tely Wed Jun 16 09:12:16 2004 +++ lilypond/files/patch-Documentation:usr:lilypond.tely Sun Jul 10 12:12:56 2005 @@ -1,10 +1,12 @@ ---- Documentation/user/lilypond.tely.orig Sun Apr 11 09:44:32 2004 -+++ Documentation/user/lilypond.tely Sun Apr 11 09:45:09 2004 -@@ -17,14 +17,14 @@ +--- Documentation/user/lilypond.tely.orig Sun Jul 10 12:10:42 2005 ++++ Documentation/user/lilypond.tely Sun Jul 10 12:11:44 2005 +@@ -17,15 +17,15 @@ @c prepend GNU for dir, must be unique @c do not list the `lilypond' node at toplevel, so that `info lilypond' @c goes to Top. --@c * lilypond: (lilypond/lilypond)Invoking LilyPond. Titling LilyPond scores. +-@c * lilypond: (lilypond/lilypond)Running LilyPond. Invoking the ++@c * lilypond: (lilypond)Running LilyPond. Invoking the + @c LilyPond program. -* GNU LilyPond: (lilypond/lilypond). The GNU music typesetter. -* convert-ly: (lilypond/lilypond)Invoking convert-ly. Older LilyPond versions. -* midi2ly: (lilypond/lilypond)Invoking midi2ly. Importing MIDI. @@ -12,7 +14,6 @@ -* abc2ly: (lilypond/lilypond)Invoking abc2ly. Importing ABC. -* musedata2ly: (lilypond/lilypond)Invoking musedata2ly. Importing MuseData. -* mup2ly: (lilypond/lilypond)Invoking mup2ly. Importing Mup. -+@c * lilypond: (lilypond)Invoking LilyPond. Titling LilyPond scores. +* GNU LilyPond: (lilypond). The GNU music typesetter. +* convert-ly: (lilypond)Invoking convert-ly. Older LilyPond versions. +* midi2ly: (lilypond)Invoking midi2ly. Importing MIDI. @@ -21,3 +22,5 @@ +* musedata2ly: (lilypond)Invoking musedata2ly. Importing MuseData. +* mup2ly: (lilypond)Invoking mup2ly. Importing Mup. @end direntry + + diff -ruN lilypond.orig/files/patch-buildscripts:lilypond-profile.sh lilypond/files/patch-buildscripts:lilypond-profile.sh --- lilypond.orig/files/patch-buildscripts:lilypond-profile.sh Thu Jan 1 10:00:00 1970 +++ lilypond/files/patch-buildscripts:lilypond-profile.sh Sun Jul 10 12:56:33 2005 @@ -0,0 +1,11 @@ +--- buildscripts/lilypond-profile.sh.orig Sun Jul 10 12:55:42 2005 ++++ buildscripts/lilypond-profile.sh Sun Jul 10 12:55:53 2005 +@@ -22,7 +22,7 @@ + return 2 + fi + +-if [ -z "$ZSH_NAME" -a `basename "$0"` = "lilypond-profile" ] ; then ++if [ -z "$ZSH_NAME" -a `basename -- "$0"` = "lilypond-profile" ] ; then + cat >/dev/stderr <<EOF + + Error: This script cannot be run in a subshell; it MUST be sourced. diff -ruN lilypond.orig/files/patch-mf:GNUMakefile lilypond/files/patch-mf:GNUMakefile --- lilypond.orig/files/patch-mf:GNUMakefile Sun Jun 27 04:17:23 2004 +++ lilypond/files/patch-mf:GNUMakefile Thu Jan 1 10:00:00 1970 @@ -1,37 +0,0 @@ ---- 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-2.2.2" - @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) -+ wget --passive-ftp -P $(outdir) http://www.lilypond.org/ftp/binaries/Fedora-1/$(redhat-package) -+ #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!) diff -ruN lilypond.orig/pkg-descr lilypond/pkg-descr --- lilypond.orig/pkg-descr Wed Jun 16 09:12:15 2004 +++ lilypond/pkg-descr Sun Jul 10 11:50:18 2005 @@ -7,6 +7,4 @@ tool, midi2ly. Conversion tools for PMX, MUP, ABC, Finale and Musedata are also included. -WWW: http://lilypond.org/web/ - -Patrick Atamaniuk +WWW: http://lilypond.org/ diff -ruN lilypond.orig/scripts/post-configure lilypond/scripts/post-configure --- lilypond.orig/scripts/post-configure Fri Nov 21 07:17:10 2003 +++ lilypond/scripts/post-configure Thu Jan 1 10:00:00 1970 @@ -1,14 +0,0 @@ -#!/bin/sh -outdir=out -cd ${WRKSRC} || exit 2 - file=lily/$outdir/lexer.cc - echo -n "Generating and fixing $file... " - rm -f $file - gmake conf=$CONF -C lily $outdir/lexer.cc || true - - mv $file $file.orig - sed -e 's/istream\*/std::istream*/g' \ - -e 's/ostream\*/std::ostream*/g' \ - -e 's/class istream;/#include \<iostream\>/g' \ - $file.orig > $file - echo "done" diff -ruN lilypond.orig/scripts/post-patch lilypond/scripts/post-patch --- lilypond.orig/scripts/post-patch Wed Jun 16 09:12:16 2004 +++ lilypond/scripts/post-patch Thu Jan 1 10:00:00 1970 @@ -1,20 +0,0 @@ -#!/bin/sh -outdir=out -cd ${WRKSRC} || exit 2 -echo "Patching for FlexLexer.h <->gcc3 issues" - -file="" -candidates=`find /usr/include -name FlexLexer.h` -#take first found file. -for d in $candidates; do if [ -f $d ]; then file=$d; break; fi; done -if [ -z "${file}" ]; then echo "Cannot find FlexLexer.h"; exit 2; fi - -echo -n "Copying and fixing $file... " -mkdir -p lily/$outdir -rm -f lily/$outdir/FlexLexer.h -sed \ - -e 's/istream/std::istream/' \ - -e 's/[^i]ostream/std::ostream/' \ - -e 's/iostream.h/iostream/' \ - $file > lily/$outdir/FlexLexer.h -echo "done" --- ports-lilypond-2.4.6.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050712000451.GA17192>