<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9961946fc4ced2137813560b14084c45748f12bb">https://github.com/macports/macports-ports/commit/9961946fc4ced2137813560b14084c45748f12bb</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 9961946fc4c espeak-ng: Fix detection of gradle; other fixups
</span>9961946fc4c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9961946fc4ced2137813560b14084c45748f12bb
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Aug 17 21:20:25 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> espeak-ng: Fix detection of gradle; other fixups
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix detection of gradle to avoid a syntax error being printed during
</span><span style='display:block; white-space:pre;color:#404040;'> configure output. With this detection fixed, add a configure argument to
</span><span style='display:block; white-space:pre;color:#404040;'> ensure that gradle is not used, even if it is installed.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Disable silent rules.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use test.env to set test environment variables rather than combining
</span><span style='display:block; white-space:pre;color:#404040;'> them with test.cmd.
</span>---
audio/espeak-ng/Portfile | 15 ++++++++++++---
audio/espeak-ng/files/gradle.patch | 24 ++++++++++++++++++++++++
2 files changed, 36 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/espeak-ng/Portfile b/audio/espeak-ng/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2f3247f7b94..ccfe474f115 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/espeak-ng/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/espeak-ng/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,11 +23,13 @@ checksums rmd160 a39908a309e0ead84d1e8b922adcfa3df153b35d \
</span>
conflicts espeak
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-espeak-ng-mac.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-espeak-ng-mac.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gradle.patch
</span>
depends_lib port:pcaudiolib \
port:sonic
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# We are patching configure.ac and Makefile.am.
</span> use_autoreconf yes
autoreconf.cmd ./autogen.sh
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,9 +41,16 @@ depends_build port:rb27-ronn-ng \
</span> port:pkgconfig
configure.env RONN=${prefix}/bin/ronn-2.7 KRAMDOWN=${prefix}/bin/kramdown-2.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-extdict-ru --with-extdict-zh --with-extdict-zhy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-extdict-ru \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-extdict-zh \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-extdict-zhy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-gradle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.target src/espeak-ng src/speak-ng en
test.run yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-test.cmd ESPEAK_DATA_PATH=`pwd` DYLD_LIBRARY_PATH=src src/espeak-ng "Testing." -w test.wav
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.env DYLD_LIBRARY_PATH=src \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESPEAK_DATA_PATH=.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.cmd src/espeak-ng "Testing." -w test.wav
</span> test.target
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/espeak-ng/files/gradle.patch b/audio/espeak-ng/files/gradle.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..14ec8b7d956
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/espeak-ng/files/gradle.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix detection of gradle. Combination of:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/espeak-ng/espeak-ng/commit/eaa553748e6a9e8fdabf9f2f97c389b5c30d3239
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/espeak-ng/espeak-ng/commit/b4589413d7badbc75e800bcdad540a6119215447
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/espeak-ng/espeak-ng/pull/1003
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2019-11-29 10:50:54.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2021-08-17 19:40:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -76,13 +76,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl ================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_CHECKING([for gradle])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test -e ${GRADLE} ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_RESULT([${GRADLE}])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AM_CONDITIONAL(HAVE_GRADLE, [1])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if command -v "$GRADLE" >/dev/null; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_RESULT([$GRADLE])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_RESULT([no])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AM_CONDITIONAL(HAVE_GRADLE, [0])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GRADLE=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AM_CONDITIONAL(HAVE_GRADLE, [test x"$GRADLE" != x])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(GRADLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>