<pre style='margin:0'>
Jeremy Lavergne (nerdling) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/877b2f93bbdfdeac135d9ab072ec203c6f7200a6">https://github.com/macports/macports-ports/commit/877b2f93bbdfdeac135d9ab072ec203c6f7200a6</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 877b2f93bbd WIP: lilypond: fix 62801
</span>877b2f93bbd is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 877b2f93bbdfdeac135d9ab072ec203c6f7200a6
</span>Author: Enrico M. Crisostomo <enrico.m.crisostomo@gmail.com>
AuthorDate: Sun May 30 17:35:12 2021 +0200

<span style='display:block; white-space:pre;color:#404040;'>    WIP: lilypond: fix 62801
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/62801
</span>---
 textproc/lilypond/Portfile                               | 16 +++++++++++++++-
 .../lilypond/files/patch-add-flex-to-include-devel.diff  | 13 +++++++++++++
 textproc/lilypond/files/patch-add-flex-to-include.diff   | 13 +++++++++++++
 textproc/lilypond/files/patch-fix-missing-override.diff  | 11 +++++++++++
 4 files changed, 52 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/lilypond/Portfile b/textproc/lilypond/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b7bd4d56eeb..5e4f3c99376 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/lilypond/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/lilypond/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,10 +62,10 @@ if {${subport} eq ${name}} {
</span>                     sha256  3b850b7af0322db720eafe8141f4a3e275fee6e00325da85decffbdb6ffced8c \
                     size    17080861
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     set livecheck_url "development.html"
 }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> 
 set branch          [join [lrange [split ${version} .] 0 1] .]
 homepage            https://lilypond.org
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -199,6 +199,20 @@ configure.env-append    LTDL_LIBRARY_PATH=${prefix}/lib
</span> build.env-append        LTDL_LIBRARY_PATH=${prefix}/lib
 destroot.env-append     LTDL_LIBRARY_PATH=${prefix}/lib
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append   --with-flexlexer-dir=${worksrcpath}/flex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    file mkdir ${worksrcpath}/flex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    copy ${prefix}/include/FlexLexer.h ${worksrcpath}/flex/FlexLexer.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles              patch-fix-missing-override.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append       patch-add-flex-to-include.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append       patch-add-flex-to-include-devel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> 
 post-patch {
     # Use guile18 header files.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/lilypond/files/patch-add-flex-to-include-devel.diff b/textproc/lilypond/files/patch-add-flex-to-include-devel.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..bf919164db2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/lilypond/files/patch-add-flex-to-include-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac   2021-05-30 22:02:42.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac   2021-05-30 22:07:47.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,6 +45,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     [FLEXLEXER_DIR=$withval],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     [FLEXLEXER_DIR=""])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if test -n "$FLEXLEXER_DIR"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  CPPFLAGS="-I$FLEXLEXER_DIR $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_ARG_WITH(texgyre-dir,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     [AS_HELP_STRING([--with-texgyre-dir=DIR],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                     [location of TeX Gyre fonts.])],
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/lilypond/files/patch-add-flex-to-include.diff b/textproc/lilypond/files/patch-add-flex-to-include.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8a27031a91a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/lilypond/files/patch-add-flex-to-include.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac   2021-04-24 15:47:10.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac   2021-05-30 17:17:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,6 +45,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     [FLEXLEXER_DIR=$withval],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     [FLEXLEXER_DIR=""])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if test -n "$FLEXLEXER_DIR"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  CPPFLAGS="-I$FLEXLEXER_DIR $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_ARG_WITH(texgyre-dir,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     [AS_HELP_STRING([--with-texgyre-dir=DIR],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                     [location of TeX Gyre fonts.])],
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/lilypond/files/patch-fix-missing-override.diff b/textproc/lilypond/files/patch-fix-missing-override.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..711949c93f7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/lilypond/files/patch-fix-missing-override.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- flex/FlexLexer.h.orig  2021-05-30 16:27:52.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ flex/FlexLexer.h       2021-05-30 16:29:01.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -129,7 +129,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   virtual ~yyFlexLexer();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  void yy_switch_to_buffer( yy_buffer_state* new_buffer );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  void yy_switch_to_buffer( yy_buffer_state* new_buffer ) override;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   yy_buffer_state* yy_create_buffer( std::istream* s, int size );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   yy_buffer_state* yy_create_buffer( std::istream& s, int size );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   void yy_delete_buffer( yy_buffer_state* b );
</span></pre><pre style='margin:0'>

</pre>