Tue Apr 28 15:07:10 2015 UTC ()
Needs tex-lh; this was indirectly provided by dblatex until a couple of
days ago. Depend on it directly and bump PKGREVISION.


(wiz)
diff -r1.103 -r1.104 pkgsrc/print/lilypond/Makefile
cvs diff -r1.103 -r1.104 pkgsrc/print/lilypond/Makefile (switch to unified diff)

--- pkgsrc/print/lilypond/Makefile 2015/04/25 14:24:46 1.103
+++ pkgsrc/print/lilypond/Makefile 2015/04/28 15:07:10 1.104
@@ -1,66 +1,67 @@ @@ -1,66 +1,67 @@
1# $NetBSD: Makefile,v 1.103 2015/04/25 14:24:46 tnn Exp $ 1# $NetBSD: Makefile,v 1.104 2015/04/28 15:07:10 wiz Exp $
2 2
3DISTNAME= lilypond-2.18.2 3DISTNAME= lilypond-2.18.2
4PKGREVISION= 3 4PKGREVISION= 4
5CATEGORIES= print 5CATEGORIES= print
6MASTER_SITES= http://download.linuxaudio.org/lilypond/sources/v2.18/ 6MASTER_SITES= http://download.linuxaudio.org/lilypond/sources/v2.18/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://lilypond.org/ 9HOMEPAGE= http://lilypond.org/
10COMMENT= GNU Music Typesetter 10COMMENT= GNU Music Typesetter
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13BUILD_DEPENDS+= tex-metafont-[0-9]*:../../fonts/tex-metafont 13BUILD_DEPENDS+= tex-metafont-[0-9]*:../../fonts/tex-metafont
14BUILD_DEPENDS+= tex-metapost-[0-9]*:../../graphics/tex-metapost 14BUILD_DEPENDS+= tex-metapost-[0-9]*:../../graphics/tex-metapost
15BUILD_DEPENDS+= urw-fonts-[0-9]*:../../fonts/urw-fonts 15BUILD_DEPENDS+= urw-fonts-[0-9]*:../../fonts/urw-fonts
16BUILD_DEPENDS+= intlfonts-[0-9]*:../../fonts/intlfonts 16BUILD_DEPENDS+= intlfonts-[0-9]*:../../fonts/intlfonts
17BUILD_DEPENDS+= font-cronyx-cyrillic-[0-9]*:../../fonts/font-cronyx-cyrillic 17BUILD_DEPENDS+= font-cronyx-cyrillic-[0-9]*:../../fonts/font-cronyx-cyrillic
18BUILD_DEPENDS+= kochi-ttf-[0-9]*:../../fonts/kochi-ttf 18BUILD_DEPENDS+= kochi-ttf-[0-9]*:../../fonts/kochi-ttf
19BUILD_DEPENDS+= fontforge>=20060125:../../fonts/fontforge 19BUILD_DEPENDS+= fontforge>=20060125:../../fonts/fontforge
20BUILD_DEPENDS+= t1utils>=1.33:../../fonts/t1utils 20BUILD_DEPENDS+= t1utils>=1.33:../../fonts/t1utils
21BUILD_DEPENDS+= dblatex-[0-9]*:../../textproc/dblatex 21BUILD_DEPENDS+= dblatex-[0-9]*:../../textproc/dblatex
22BUILD_DEPENDS+= rsync-[0-9]*:../../net/rsync 22BUILD_DEPENDS+= rsync-[0-9]*:../../net/rsync
23# pngtopnm 23# pngtopnm
24BUILD_DEPENDS+= netpbm-[0-9]*:../../graphics/netpbm 24BUILD_DEPENDS+= netpbm-[0-9]*:../../graphics/netpbm
25# convert 25# convert
26BUILD_DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick 26BUILD_DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick
27 27
28DEPENDS+= tex-cyrillic-[0-9]*:../../print/tex-cyrillic 28DEPENDS+= tex-cyrillic-[0-9]*:../../print/tex-cyrillic
 29DEPENDS+= tex-lh-[0-9]*:../../fonts/tex-lh
29DEPENDS+= tex-psnfss-[0-9]*:../../fonts/tex-psnfss 30DEPENDS+= tex-psnfss-[0-9]*:../../fonts/tex-psnfss
30DEPENDS+= tex-epsf-[0-9]*:../../print/tex-epsf 31DEPENDS+= tex-epsf-[0-9]*:../../print/tex-epsf
31DEPENDS+= tex-graphics-[0-9]*:../../print/tex-graphics 32DEPENDS+= tex-graphics-[0-9]*:../../print/tex-graphics
32# 1.7 coredumps when generating eps files 33# 1.7 coredumps when generating eps files
33DEPENDS+= potrace>=1.8:../../graphics/potrace 34DEPENDS+= potrace>=1.8:../../graphics/potrace
34 35
35GNU_CONFIGURE= YES 36GNU_CONFIGURE= YES
36USE_PKGLOCALEDIR= YES 37USE_PKGLOCALEDIR= YES
37USE_LANGUAGES= c c++ 38USE_LANGUAGES= c c++
38USE_TOOLS+= bison flex gmake gs:run makeinfo perl pkg-config msgfmt 39USE_TOOLS+= bison flex gmake gs:run makeinfo perl pkg-config msgfmt
39USE_TOOLS+= texi2html zip 40USE_TOOLS+= texi2html zip
40MAKE_FILE= GNUmakefile 41MAKE_FILE= GNUmakefile
41 42
42.include "../../mk/bsd.prefs.mk" 43.include "../../mk/bsd.prefs.mk"
43 44
44TEXINFO_REQD= 4.11 45TEXINFO_REQD= 4.11
45GCC_REQD+= 3.0.5 46GCC_REQD+= 3.0.5
46 47
47GNU_CONFIGURE_INFODIR= ${PREFIX}/${PKGINFODIR} 48GNU_CONFIGURE_INFODIR= ${PREFIX}/${PKGINFODIR}
48INFO_DIR= ${GNU_CONFIGURE_INFODIR} 49INFO_DIR= ${GNU_CONFIGURE_INFODIR}
49INFO_FILES= YES 50INFO_FILES= YES
50 51
51CONFIGURE_ARGS+= --disable-optimising 52CONFIGURE_ARGS+= --disable-optimising
52CONFIGURE_ARGS+= --with-ncsb-dir=${PREFIX}/share/fonts/urw 53CONFIGURE_ARGS+= --with-ncsb-dir=${PREFIX}/share/fonts/urw
53CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} 54CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
54 55
55REPLACE_PYTHON+= scripts/build/yyout2grammar.py 56REPLACE_PYTHON+= scripts/build/yyout2grammar.py
56PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 2.18.0 57PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 2.18.0
57PLIST_SUBST+= PKGVERSION=${PKGVERSION:S/nb${PKGREVISION}//} 58PLIST_SUBST+= PKGVERSION=${PKGVERSION:S/nb${PKGREVISION}//}
58 59
59# needs FlexLexer.h 60# needs FlexLexer.h
60.include "../../devel/flex/buildlink3.mk" 61.include "../../devel/flex/buildlink3.mk"
61.include "../../devel/pango/buildlink3.mk" 62.include "../../devel/pango/buildlink3.mk"
62.include "../../fonts/fontconfig/buildlink3.mk" 63.include "../../fonts/fontconfig/buildlink3.mk"
63.include "../../lang/guile/buildlink3.mk" 64.include "../../lang/guile/buildlink3.mk"
64.include "../../lang/python/application.mk" 65.include "../../lang/python/application.mk"
65.include "../../mk/omf-scrollkeeper.mk" 66.include "../../mk/omf-scrollkeeper.mk"
66.include "../../mk/bsd.pkg.mk" 67.include "../../mk/bsd.pkg.mk"