On 12/6/2011 3:27 PM, Pierre Abbat wrote: > On Monday 05 December 2011 20:27:44 John Marino wrote: >> I committed fixes for both Lilypond and kdesdk3. The pkgsrc-current >> should build now. > > The last two commits I see are to devel/opal and a very short change to the > list of changes. I'm on 2011Q3 and don't see a branch called pkgsrc-current. > Do I switch to master, or do I have to do something else? > > Pierre >
2011Q3 is a branch, -current is the head of pkgsrc (bleeding edge). Just apply this patch to print/lilypond/Makefile: --- Makefile.orig 2011-12-06 18:41:16.069151000 +0100 +++ Makefile 2011-12-06 19:28:43.861750000 +0100 @@ -16,7 +16,7 @@ GNU_CONFIGURE= YES USE_PKGLOCALEDIR= YES USE_LANGUAGES= c c++ -USE_TOOLS+= bison flex gmake gs:run makeinfo perl pkg-config msgfmt +USE_TOOLS+= bison gmake gs:run makeinfo perl pkg-config msgfmt USE_TOOLS+= texi2html MAKE_FILE= GNUmakefile @@ -42,6 +42,13 @@ # 1.7 coredumps when generating eps files DEPENDS+= potrace>=1.8:../../graphics/potrace +.if ${OPSYS} == "DragonFly" +CONFIGURE_ENV+= LEX="${PREFIX}/bin/flex" +.include "../../devel/flex/buildlink3.mk" +.else +USE_TOOLS+= flex +.endif + .include "../../devel/pango/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../lang/guile/buildlink3.mk"