From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jan 24 18:00:22 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4488916A420 for ; Tue, 24 Jan 2006 18:00:22 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5682B43D6A for ; Tue, 24 Jan 2006 18:00:16 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k0OI0GWT090782 for ; Tue, 24 Jan 2006 18:00:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k0OI0GnE090776; Tue, 24 Jan 2006 18:00:16 GMT (envelope-from gnats) Resent-Date: Tue, 24 Jan 2006 18:00:16 GMT Resent-Message-Id: <200601241800.k0OI0GnE090776@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Roman Kurakin Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2C35716A420 for ; Tue, 24 Jan 2006 17:54:46 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7869A43D48 for ; Tue, 24 Jan 2006 17:54:45 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k0OHsjRG021925 for ; Tue, 24 Jan 2006 17:54:45 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id k0OHsjJc021924; Tue, 24 Jan 2006 17:54:45 GMT (envelope-from nobody) Message-Id: <200601241754.k0OHsjJc021924@www.freebsd.org> Date: Tue, 24 Jan 2006 17:54:45 GMT From: Roman Kurakin To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Cc: Subject: ports/92277: print/lilypond port compilation fix X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jan 2006 18:00:22 -0000 >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 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 \/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: