<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/40c217020ef9bfb12eff56e745fbb31e1a93c90d">https://github.com/macports/macports-ports/commit/40c217020ef9bfb12eff56e745fbb31e1a93c90d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 40c217020ef9bfb12eff56e745fbb31e1a93c90d
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Mar 22 21:02:38 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> moon-buggy: Fix build with autoconf 2.71
</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/64874
</span>---
games/moon-buggy/Portfile | 10 ++--
...on-buggy-makefile-am.diff => Makefile.am.patch} | 7 ++-
games/moon-buggy/files/autoconf-2.71.patch | 69 ++++++++++++++++++++++
3 files changed, 79 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/moon-buggy/Portfile b/games/moon-buggy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 23df14e363e..021d5871994 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/moon-buggy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/moon-buggy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,11 +5,13 @@ PortGroup github 1.0
</span>
github.setup seehuhn moon-buggy c6a7f2d6fcb478c688f7b3cf702dd43e39fad05c
version 20170822
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> license GPL-3
categories games
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description Drive a car across the moon, jump craters
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> long_description Moon-buggy is a simple character graphics game, where you drive some kind \
of car across the moon's surface. Unfortunately there are dangerous \
craters there. Fortunately your car can jump over them!
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +21,7 @@ checksums rmd160 f18e6001d5bb7791a549aaf4bf4de72b68c08f2e \
</span>
depends_lib-append port:ncurses
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append Makefile.am.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ autoconf-2.71.patch
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch makefile to prevent test-running program as root during install (which fails)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-moon-buggy-makefile-am.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoreconf yes
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/moon-buggy/files/patch-moon-buggy-makefile-am.diff b/games/moon-buggy/files/Makefile.am.patch
</span>similarity index 50%
rename from games/moon-buggy/files/patch-moon-buggy-makefile-am.diff
rename to games/moon-buggy/files/Makefile.am.patch
<span style='display:block; white-space:pre;color:#808080;'>index 526314284af..16f4663a32b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/moon-buggy/files/patch-moon-buggy-makefile-am.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/moon-buggy/files/Makefile.am.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.am.orig 2016-11-28 15:40:02.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.am 2016-11-28 15:40:28.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -51,7 +51,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Prevent test-running a program as root during the install (which fails).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.am.orig 2017-08-22 09:56:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.am 2022-03-22 20:32:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,7 +50,6 @@
</span> || chmod 664 "$(DESTDIR)$(scoredir)/mbscore" ; } \
&& chmod 575 "$(DESTDIR)$(scoredir)" ; \
fi
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/moon-buggy/files/autoconf-2.71.patch b/games/moon-buggy/files/autoconf-2.71.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c599ed6fd40
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/moon-buggy/files/autoconf-2.71.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,69 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Update for autoconf 2.71 compatibility.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/seehuhn/moon-buggy/issues/7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/seehuhn/moon-buggy/pull/8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2017-08-22 09:56:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2022-03-22 20:51:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,9 +1,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl Process this file with autoconf to produce a configure script.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AC_INIT(moon-buggy, 1.0.51, voss@seehuhn.de)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_INIT([moon-buggy],[1.0.51],[voss@seehuhn.de])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CONFIG_SRCDIR([moon-buggy.h])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_INIT_AUTOMAKE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AM_CONFIG_HEADER(config.h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_CONFIG_HEADERS([config.h])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CANONICAL_HOST
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,19 +24,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl Checks for programs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_PROG_CC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_PROG_CPP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_PROG_EGREP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl Checks for libraries.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_LIB(m, modf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JV_CHECK_CURSES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl Checks for header files.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AC_HEADER_STDC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_HEADERS(getopt.h errno.h locale.h termios.h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Check if <sys/select.h> needs to be included for fd_set
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_CHECKING([for fd_set])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AC_TRY_COMPILE([#include <sys/types.h>],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [fd_set readMask, writeMask;], mb_ok=yes, mb_ok=no)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>]],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [[fd_set readMask, writeMask;]])],[mb_ok=yes],[mb_ok=no])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test $mb_ok = yes; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_RESULT([yes, found in sys/types.h])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -57,7 +58,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_TYPE_SIZE_T
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl Checks for library functions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AC_TYPE_SIGNAL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_FUNCS(fclean ftruncate getopt_long setreuid setlocale)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_CONDITIONAL(short_getopt, test "x$ac_cv_func_getopt_long" != xyes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- signal.c.orig 2017-08-22 09:56:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ signal.c 2022-03-22 20:25:36.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,7 +45,7 @@
</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;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-install_signal (int signum, RETSIGTYPE (*handler) ())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install_signal (int signum, void (*handler) ())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Emulate the `signal' function via `sigaction'. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct sigaction action;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,7 +58,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ assert (ret == 0);
</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;'>+-static RETSIGTYPE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ generic_handler (int signum)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Interrupt handlers shouldn't do much. So we just note that the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * signal arrived. */
</span></pre><pre style='margin:0'>
</pre>