Commits

Werner Lemberg authored and Chris Jones committed 30b46109ce9
lilypond-devel: fix assignments in `depends_build` vs. `depends_lib`

Replace compiler whitelist with fallback list. Also do some formatting.
No tags

textproc/lilypond-devel/Portfile

Modified
1 1 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
2 2
3 3 PortSystem 1.0
4 4 PortGroup compiler_blacklist_versions 1.0
5 5 PortGroup cxx11 1.1
6 6
7 7 name lilypond-devel
8 8 set my_name lilypond
9 9 version 2.19.83
10 -revision 1
10 +revision 2
11 11 set branch [join [lrange [split ${version} .] 0 1] .]
12 12 categories textproc
13 13 maintainers {snc @nerdling} openmaintainer
14 14 license GPL-3+
15 15 description An automated engraving system for typesetting sheet music.
16 16 long_description Lilypond is a unix-based automated engraving system that \
17 17 generates beautiful sheet music from input files. Lilypond \
18 18 uses its own input format, .ly, which in many ways is \
19 19 similar to LaTeX. Lilypond can export sheet music to PDF, \
20 20 EPS, SVG, and PNG formats, and can also create MIDI files.
21 21
22 22 homepage http://lilypond.org/
23 23 conflicts lilypond
24 24 platforms darwin
25 25 master_sites http://lilypond.org/download/sources/v${branch}/
26 26 # master_sites http://download.linuxaudio.org/lilypond/sources/v${branch}/
27 27 distname ${my_name}-${version}
28 28 checksums rmd160 6250667c2a2799ec404e10e3e141101d043ab7f6 \
29 29 sha256 96ba4f4b342d21057ad74d85d647aea7e47a5c24f895127c2b3553a252738fb3 \
30 30 size 17996428
31 31
32 -depends_build port:autoconf \
33 - port:t1utils \
32 +depends_build-append \
33 + port:autoconf \
34 34 port:bison \
35 - port:texi2html \
36 - port:netpbm \
37 - port:pkgconfig \
35 + port:dblatex \
38 36 port:flex \
39 37 port:fontforge \
40 - port:libtool
41 -
42 -depends_lib port:fontconfig \
43 - port:freetype \
44 - port:gettext \
45 - path:lib/pkgconfig/glib-2.0.pc:glib2 \
46 - port:ghostscript \
47 - port:gmp \
48 - port:guile18 \
38 + port:libtool \
39 + port:netpbm \
40 + port:pkgconfig \
49 41 port:texinfo \
50 - path:lib/pkgconfig/pango.pc:pango \
42 + port:texi2html \
51 43 port:texlive \
52 44 port:texlive-fonts-recommended \
53 45 port:texlive-lang-cyrillic \
54 46 port:texlive-metapost \
55 - port:dblatex \
56 - port:python27 \
47 + port:t1utils \
57 48 port:urw-core35-fonts
58 49
50 +depends_lib-append path:lib/pkgconfig/glib-2.0.pc:glib2 \
51 + path:lib/pkgconfig/pango.pc:pango \
52 + port:fontconfig \
53 + port:freetype \
54 + port:gettext \
55 + port:ghostscript \
56 + port:guile18 \
57 + port:python27
58 +
59 59 configure.cmd autoconf -f && ./configure
60 60 configure.python ${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7
61 61
62 62 set lilyponddevel.texgyredir \
63 63 "${prefix}/share/texmf-texlive/fonts/opentype/public/tex-gyre"
64 64 set lilyponddevel.mactex_bin ""
65 65 set lilyponddevel.temp ""
66 66
67 67 variant mactex description {Allow lilypond-devel to use MacTeX or another\
68 68 external TeXLive installation instead of MacPorts TeXLive tools. To\
104 104 [file dirname \
105 105 [exec ${lilyponddevel.mactex_bin}/kpsewhich texgyreschola-regular.otf]]
106 106 } else {
107 107 pre-fetch {
108 108 return -code error "TeXLive package 'tex-gyre' not\
109 109 installed; aborting. Please install it, then\
110 110 try again"
111 111 }
112 112 }
113 113
114 - depends_lib-delete port:texlive \
115 - port:texlive-fonts-recommended \
116 - port:texlive-lang-cyrillic \
117 - port:texlive-metapost
114 + depends_build-delete port:texlive \
115 + port:texlive-fonts-recommended \
116 + port:texlive-lang-cyrillic \
117 + port:texlive-metapost
118 118
119 119 configure.args-append --with-texgyre-dir=${lilyponddevel.texgyredir}
120 120 }
121 121
122 122 patchfiles patch-scripts-build-mf2pt1.pl.diff \
123 123 patch-no-Wstrict-prototypes-warning.diff
124 124 post-patch {
125 125 # Use guile18 header files
126 126 reinplace s|libguile\.h|libguile18.h|g \
127 127 ${worksrcpath}/aclocal.m4 \
138 138 # https://lists.gnu.org/archive/html/bug-lilypond/2016-07/msg00071.html
139 139 #
140 140 # and the thread starting with
141 141 #
142 142 # http://lists.llvm.org/pipermail/cfe-users/2018-November/001417.html
143 143 #
144 144 # According to one of the main developers of lilypond, it is not
145 145 # possible to circumvent this issue without rewriting a considerable
146 146 # amount of code.
147 147
148 +# g++ uses libstdc++; setting this prevents the application from being
149 +# flagged as broken.
150 +configure.cxx_stdlib macports-libstdc++
151 +
148 152 # blacklist any clang compiler and any old gcc (a better expression is needed)
149 -compiler.blacklist \
150 - *clang* \
151 - *llvm-gcc* \
152 - *apple-gcc* \
153 - gcc \
154 - gcc-3.3 gcc-4.0 gcc-4.2
155 -compiler.whitelist \
156 - macports-gcc-8 \
157 - macports-gcc-7 \
158 - macports-gcc-6 \
159 - macports-gcc-5 \
160 - macports-gcc-4.9 macports-gcc-4.8 macports-gcc-4.7
161 -configure.cxx_stdlib macports-libstdc++
153 +compiler.blacklist *clang* \
154 + *llvm-gcc* \
155 + *apple-gcc* \
156 + gcc \
157 + gcc-3.3 gcc-4.0 gcc-4.2
158 +
159 +compiler.fallback-append \
160 + macports-gcc-8 \
161 + macports-gcc-7 \
162 + macports-gcc-6 \
163 + macports-gcc-5 \
164 + macports-gcc-4.9 macports-gcc-4.8 macports-gcc-4.7
162 165
163 166 configure.args-append \
164 - --with-urwotf-dir=${prefix}/share/fonts/urw-core35-fonts \
165 - --enable-documentation
167 + --with-urwotf-dir=${prefix}/share/fonts/urw-core35-fonts \
168 + --enable-documentation
166 169 if {![variant_isset mactex]} {
167 170 configure.args-append --with-texgyre-dir=${lilyponddevel.texgyredir}
168 171 }
172 +
169 173 configure.env LTDL_LIBRARY_PATH=${prefix}/lib \
170 - PYTHON_CONFIG=${configure.python}-config \
171 - GUILE=${prefix}/bin/guile18 \
172 - GUILE_CONFIG=${prefix}/bin/guile18-config \
173 - GUILE_TOOLS=${prefix}/bin/guile18-tools
174 + PYTHON_CONFIG=${configure.python}-config \
175 + GUILE=${prefix}/bin/guile18 \
176 + GUILE_CONFIG=${prefix}/bin/guile18-config \
177 + GUILE_TOOLS=${prefix}/bin/guile18-tools
174 178
175 179 build.env LTDL_LIBRARY_PATH=${prefix}/lib
176 180
177 181 destroot.env LTDL_LIBRARY_PATH=${prefix}/lib
178 182 post-destroot {
179 183 move ${destroot}${prefix}/bin/lilypond \
180 184 ${destroot}${prefix}/libexec/lilypond-bin
181 185 xinstall -m 755 ${filespath}/lilypond.in ${destroot}${prefix}/bin/lilypond
182 186 reinplace "s|@@PREFIX@@|${prefix}|g" ${destroot}${prefix}/bin/lilypond
183 187 }
184 188
185 -livecheck.type regex
186 -livecheck.url ${homepage}/development.html
187 -livecheck.regex ${my_name}-(\\d+(\\.\\d+)+)
189 +livecheck.type regex
190 +livecheck.url ${homepage}/development.html
191 +livecheck.regex ${my_name}-(\\d+(\\.\\d+)+)

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut