Date: Mon, 17 Nov 2003 03:40:07 -0800 (PST) From: Patrick Atamaniuk <atamaniuk-ports@frobs.net> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/58260: New Port: print/lilypond-devel Message-ID: <200311171140.hAHBe7F9092212@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/58260; it has been noted by GNATS.
From: Patrick Atamaniuk <atamaniuk-ports@frobs.net>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:
Subject: Re: ports/58260: New Port: print/lilypond-devel
Date: Mon, 17 Nov 2003 12:35:35 +0100
Update (to version available at portrookies):
follow renamed port pktrace to mftrace
fix configure issue for 4.9-RELEASE
fix call of install script at post-install
diff --exclude=CVS --exclude=Makefile.local -ruN lilypond-devel.orig/Makefile lilypond-devel/Makefile
--- lilypond-devel.orig/Makefile Mon Nov 17 11:28:51 2003
+++ lilypond-devel/Makefile Mon Nov 17 11:25:43 2003
@@ -16,7 +16,7 @@
COMMENT= The GNU music typesetter (unstable/development)
BUILD_DEPENDS= latex:${PORTSDIR}/print/teTeX \
- mftrace:${PORTSDIR}/print/pktrace
+ mftrace:${PORTSDIR}/print/mftrace
LIB_DEPENDS= guile.15:${PORTSDIR}/lang/guile
RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
@@ -24,6 +24,8 @@
lilypond-book.1 midi2ly.1 mup2ly.1 musedata2ly.1 pmx2ly.1
INFO= lilypond lilypond-internals music-glossary
+CONFLICTS= lilypond*
+
GNU_CONFIGURE= yes
USE_BISON= yes
USE_GMAKE= YES
@@ -32,9 +34,12 @@
CONFIGURE_ARGS+= --with-kpathsea-include=${LOCALBASE}/include \
--with-kpathsea-lib=${LOCALBASE}/lib
+CONFIGURE_ENV+= "CPPFLAGS=${CPPFLAGS}"
# inform kpathsea.h of getopt-prototype version
CFLAGS+= -D__GNU_LIBRARY__
+CPPFLAGS+= -I${WRKSRC}/lily/out
+CFLAGS+= ${CPPFLAGS}
.include <bsd.port.pre.mk>
MAKE_ENV+= MAKE_PFA_FILES=1
@@ -42,8 +47,6 @@
.if ${OSVERSION} < 500000
USE_GCC= 3.3
-OLD_CPP_INCLUDEDIR= /usr/include/g++
-CONFIGURE_ENV+= "CPPFLAGS=$${CPPFLAGS} -idirafter ${OLD_CPP_INCLUDEDIR}"
.endif
SCRIPTS_ENV+= PORTVERSION=${PORTVERSION}
@@ -85,7 +88,7 @@
- install-info ${PREFIX}/info/${ii}.info ${PREFIX}/info/dir
.endfor
.endif
- ${SETENV} PKG_PREFIX=${PREFIX} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
@${ECHO_CMD} "* Look in ${EXAMPLESDIR}/scripts"
@${ECHO_CMD} "* for needed additions to your .profile"
diff --exclude=CVS --exclude=Makefile.local -ruN lilypond-devel.orig/scripts/pre-configure lilypond-devel/scripts/pre-configure
--- lilypond-devel.orig/scripts/pre-configure Thu Jan 1 01:00:00 1970
+++ lilypond-devel/scripts/pre-configure Mon Nov 17 11:23:27 2003
@@ -0,0 +1,16 @@
+#!/bin/sh
+outdir=out
+cd ${WRKSRC} || exit 2
+echo "Patching for FlexLexer.h <->gcc3 issues"
+
+file=/usr/include/g++/FlexLexer.h
+
+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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311171140.hAHBe7F9092212>