Attachment 61609 Details for Bug 92277 – file.diff

[patch] file.diff

file.diff (text/plain), 2.79 KB, created by Roman Kurakin on 2006-01-24 18:00:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roman Kurakin

Created: 2006-01-24 18:00:15 UTC

Size: 2.79 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /CVS/FreeBSD/ports/print/lilypond/Makefile,v
>retrieving revision 1.29
>diff -u -r1.29 Makefile
>--- Makefile	5 Dec 2005 03:45:48 -0000	1.29
>+++ Makefile	24 Jan 2006 17:22:35 -0000
>@@ -57,10 +57,6 @@
> .include <bsd.port.pre.mk>
> ALL_TARGET=	all
> 
>-.if ${OSVERSION} >= 502120
>-BROKEN=		"Does not compile on FreeBSD >= 5.x"
>-.endif
>-
> .if ${OSVERSION} < 500000
> USE_GCC=	3.4
> .endif
>@@ -83,7 +79,7 @@
> 
> .if !defined(WITH_SELFBUILT_FONTS)
> post-configure:
>-	cd ${WRKSRC} && ${GMAKE} -C mf get-pfa
>+	cd ${WRKSRC} && ${GMAKE} -C mf get-pfa DISTDIR=${DISTDIR}
> .endif
> 
> post-install:
>Index: files/patch-mf:GNUMakefile
>===================================================================
>RCS file: /CVS/FreeBSD/ports/print/lilypond/files/patch-mf:GNUMakefile,v
>retrieving revision 1.3
>diff -u -r1.3 patch-mf:GNUMakefile
>--- files/patch-mf:GNUMakefile	5 Dec 2005 03:45:48 -0000	1.3
>+++ files/patch-mf:GNUMakefile	24 Jan 2006 16:13:23 -0000
>@@ -10,7 +10,7 @@
>  	@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 "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 "
>Index: scripts/post-configure
>===================================================================
>RCS file: /CVS/FreeBSD/ports/print/lilypond/scripts/post-configure,v
>retrieving revision 1.1
>diff -u -r1.1 post-configure
>--- scripts/post-configure	20 Nov 2003 20:17:10 -0000	1.1
>+++ scripts/post-configure	24 Jan 2006 13:43:59 -0000
>@@ -7,8 +7,8 @@
>     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' \
>+    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"
>Index: scripts/post-patch
>===================================================================
>RCS file: /CVS/FreeBSD/ports/print/lilypond/scripts/post-patch,v
>retrieving revision 1.1
>diff -u -r1.1 post-patch
>--- scripts/post-patch	15 Jun 2004 23:12:16 -0000	1.1
>+++ scripts/post-patch	24 Jan 2006 13:44:09 -0000
>@@ -13,8 +13,8 @@
> mkdir -p lily/$outdir
> rm -f lily/$outdir/FlexLexer.h
> sed \
>-    -e 's/istream/std::istream/' \
>-    -e 's/[^i]ostream/std::ostream/' \
>+    -e 's/[^:]istream/std::istream/' \
>+    -e 's/[^i:]ostream/std::ostream/' \
>     -e 's/iostream.h/iostream/' \
>     $file > lily/$outdir/FlexLexer.h
> echo "done"

Actions: View | Diff

Attachments on bug 92277: 61609