Date: Tue, 24 Jan 2006 17:54:45 GMT From: Roman Kurakin <rik@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/92277: print/lilypond port compilation fix Message-ID: <200601241754.k0OHsjJc021924@www.freebsd.org> Resent-Message-ID: <200601241800.k0OI0GnE090776@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 92277
>Category: ports
>Synopsis: print/lilypond port compilation fix
>Confidential: no
>Severity: serious
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Jan 24 18:00:15 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Roman Kurakin
>Release: 5.stable
>Organization:
FreeBSD/RRC KI/INSE
>Environment:
FreeBSD serv 5.4-STABLE FreeBSD 5.4-STABLE #0: Tue Jan 3 18:31:26 MSK 2006 root@serv:/Arch/Software/Unix/FreeBSD/obj/Arch/Software/Unix/FreeBSD/src/sys/GENERIC i386
>Description:
Port doesn't compile (according to the makefile for ${OSVERSION} >= 502120).
>How-To-Repeat:
Just remove BROKEN and try to compile.
>Fix:
http://www.inse.ru/~rik/FreeBSD/ports/lilypond_060124-1.pch
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"
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200601241754.k0OHsjJc021924>