<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/07a0b460e9e79ae31e842de1a7c44ca2cf0c7c36">https://github.com/macports/macports-ports/commit/07a0b460e9e79ae31e842de1a7c44ca2cf0c7c36</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 07a0b460e9e expect: fix build on darwin 20
</span>07a0b460e9e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 07a0b460e9e79ae31e842de1a7c44ca2cf0c7c36
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Dec 29 08:00:00 2020 +1100
<span style='display:block; white-space:pre;color:#404040;'> expect: fix build on darwin 20
</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/61929
</span>---
devel/expect/Portfile | 7 ++
.../files/patch-implicitly-defined-functions.diff | 94 +++++++++++++---------
2 files changed, 63 insertions(+), 38 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/expect/Portfile b/devel/expect/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4d378a256bc..7a0301ac992 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/expect/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/expect/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,6 +59,13 @@ post-patch {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# bundled config.{guess,sub} are from 2003, update with copies from automake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:automake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy -force {*}[glob ${prefix}/share/automake-*/config.{guess,sub}] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/tclconfig/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.cppflags-append -I${workpath}/tcl${tclv}/generic -I${workpath}/tcl${tclv}/unix
configure.ldflags-append -ltclstub8.6
configure.args --disable-shared \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/expect/files/patch-implicitly-defined-functions.diff b/devel/expect/files/patch-implicitly-defined-functions.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 060402a18c3..328d35a1976 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/expect/files/patch-implicitly-defined-functions.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/expect/files/patch-implicitly-defined-functions.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,64 +1,82 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2018-02-04 04:43:58.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2020-06-25 11:03:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7989,6 +7989,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <time.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2018-02-04 21:43:58.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2020-12-29 07:54:46.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7994,7 +7994,7 @@
</span> {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8025,7 +8026,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <time.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern long timezone;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ timezone += 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit (0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8030,7 +8030,7 @@
</span> {
extern time_t timezone;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8792,6 +8793,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ timezone += 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit (0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8791,7 +8791,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking for memcpy... " >&6; }
</span> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if HAVE_STRING_H
</span> +#include <string.h>
<span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span> int
main ()
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8935,8 +8937,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8935,7 +8937,10 @@
</span> /* end confdefs.h. */
#include <signal.h>
-#define RETSIGTYPE $retsigtype
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if HAVE_UNISTD_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <sys/wait.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> int signal_rearms = 0;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- RETSIGTYPE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9234,6 +9235,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8966,7 +8971,7 @@
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sgtty.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wait(&status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unlink("core");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit(signal_rearms);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (signal_rearms);
</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;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9237,7 +9242,7 @@
</span> main()
{
struct sgttyb tmp;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9312,6 +9314,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <inttypes.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <termios.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit(0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ac_fn_c_try_run "$LINENO"; then :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9315,7 +9320,7 @@
</span> main()
{
struct termios tmp;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9563,6 +9566,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit(0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ac_fn_c_try_run "$LINENO"; then :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9570,7 +9575,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int *x = &daylight;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char **y = tzname;
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern char *tzname[2];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int daylight;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- main()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit(0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ac_fn_c_try_run "$LINENO"; then :
</span> --- exp_chan.c.orig 2018-02-02 13:15:52.000000000 -0600
+++ exp_chan.c 2020-06-25 13:23:34.000000000 -0500
@@ -34,6 +37,7 @@
</pre><pre style='margin:0'>
</pre>