<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/97b47608f2f37e4b05e7d787c30ae684a385d99c">https://github.com/macports/macports-ports/commit/97b47608f2f37e4b05e7d787c30ae684a385d99c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 97b47608f2f37e4b05e7d787c30ae684a385d99c
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Sep 2 00:57:21 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> alienarena: Update to 7.71.1-20200830-r5669
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> alienarena-data: Update to 7.71.1-20191015-r5663
</span>---
games/alienarena/Portfile | 79 +++++++---------------
games/alienarena/files/make-tarballs.sh | 65 ++++++++++++++++++
games/alienarena/files/patch-configure.ac.diff | 35 ++++------
.../alienarena/files/patch-source-Makefile.am.diff | 16 +++++
4 files changed, 122 insertions(+), 73 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/alienarena/Portfile b/games/alienarena/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1d3a8286afc..80a0fb8abf7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/alienarena/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/alienarena/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,14 +2,10 @@
</span>
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name alienarena
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.70.0-20180721
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f2e081eb64324c0e3576bb2b796c46ecb9c2a079 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 100fee4494aa11cfc3fc846e9b3a0cb64e5eb134d1afaf802024d0fc7309c27b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 913540088
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Upstream doesn't release tarballs anymore or tag their releases in svn so we
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# make our own tarballs now using the make-tarballs.sh script in the files dir.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set version_number [lindex [split ${version} -] 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set version_date [lindex [split ${version} -] 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name alienarena
</span> categories games
platforms darwin
maintainers {ryandesign @ryandesign}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,14 +26,12 @@ long_description Alien Arena combines some of the very best aspects of \
</span> have been created by community members to add on to the \
game experience.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://red.planetarena.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}files/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir ${name}/${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_zip yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname AlienArena
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir Alien Arena
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://red.planetarena.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites macports_distfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span>
platform darwin {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TODO: verify minimum OS version
</span> if {${os.major} < 9} {
# 10.4.11:
# ld: common symbols not allowed with MH_DYLIB output format with the -multi_module option
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,7 +46,11 @@ platform darwin {
</span> }
if {${name} eq ${subport}} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 7.71.1-20200830-r5669
</span> revision 0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 ee169cfcbce868535b2d381c0c573a17d160ebcb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c9083aeddfa7e70850db9f8ac7aa408e7387d2ccc66970226106b27d719c0c93 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3183432
</span>
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,33 +72,13 @@ if {${name} eq ${subport}} {
</span>
depends_run port:alienarena-data
<span style='display:block; white-space:pre;background:#ffe0e0;'>- extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Extract only the files we need: exclude Windows DLLs, EXEs, icons and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # source; Linux executables; the configure script that we'll regenerate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # anyway; and the game data that the alienarena-data subport installs.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # MacPorts base doesn't let us change unzip args so we have to override.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: Use shellescape once MacPorts 2.7.0 is out.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${workpath} "unzip -q '${distpath}/${distfiles}' -x '${worksrcdir}/*.dll' '${worksrcdir}/*.exe' '${worksrcdir}/*.ico' '${worksrcdir}/alienarena-linux64*' '${worksrcdir}/configure' '${worksrcdir}/data1/*' '${worksrcdir}/source/win32/*'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-extract {
</span> # autoreconf complains if this directory doesn't exist.
file mkdir ${worksrcpath}/data1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Make sure the port's version number is correct, since it's an
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # unversioned distfile.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set fp [open ${worksrcpath}/configure.ac r]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set file_data [read ${fp}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close ${fp}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![regexp {AC_INIT\(\[alienarena\],\[([^]]+)\],} ${file_data} -> configure_version]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "version not found in configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "version not found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure_version} ne ${version_number}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "port version ${version_number} doesn't match version in configure.ac ${configure_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "version mismatch"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-configure.ac.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-source-Makefile.am.diff
</span>
post-patch {
# The @PREFIX@ placeholder is present in configure.ac as shipped by the
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,12 +88,13 @@ if {${name} eq ${subport}} {
</span> reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/configure.ac
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # The zip file contains a configure script but it's missing the execute bit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # and none of the supporting files are present. Also, we patch configure.ac.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The distfile contains a configure script but none of the supporting files.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Also, we patch configure.ac and source/Makefile.am.
</span> use_autoreconf yes
autoreconf.args -fvi
configure.args --disable-silent-rules \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-system-libode \
</span> --with-xf86dga \
--with-xf86vm \
--with-zlib \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,16 +117,19 @@ To run your own dedicated Alien Arena server, use:
</span> ${name}-ded
"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.version [regsub {(....)(..)(..)} ${version_date} {\1-\2-\3}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.url [lindex ${master_sites} 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex {>AlienArena\.zip</a>[[:space:]]*</td><td[^>]*>([0-9-]+)}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TODO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.type none
</span> } else {
livecheck.type none
}
subport alienarena-data {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 7.71.1-20191015-r5663
</span> revision 0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 b7f817ca8a2fe61387d7c4092155708f65a65d2f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d7dee24f8c89db48b7b2ac0daae8a9e8497503debed716ba4732fa4e48433e70 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 779223968
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> license Restrictive
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -155,15 +137,6 @@ subport alienarena-data {
</span>
long_description {*}${description}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname ${subport}-${version}
</span> worksrcdir {*}${worksrcdir}/data1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Extract only the data1 directory.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # MacPorts base doesn't let us change unzip args so we have to override.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: Use shellescape once MacPorts 2.7.0 is out.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${workpath} "unzip -q '${distpath}/${distfiles}' '${worksrcdir}/*'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The configure script doesn't have the execute bit.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file attributes ${worksrcpath}/configure -permissions a+x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/alienarena/files/make-tarballs.sh b/games/alienarena/files/make-tarballs.sh
</span>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..29faf9f459c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/alienarena/files/make-tarballs.sh
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,65 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#!/bin/sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set -euo pipefail
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+requireprog() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ! command -v "$1" > /dev/null; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf "Cannot find %s (sudo port install %s)\n" "$1" "$2" 1>&2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit 1
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+requireprog pixz pixz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+requireprog svn subversion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if [ -d trunk ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf "Updating working copy\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ svn revert -R trunk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ svn up trunk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf "Checking out working copy\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ svn co svn://svn.icculus.org/alienarena/trunk
</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;'>+version=$(sed -En 's%^AC_INIT\(\[alienarena\],\[([^]]+)].*$%\1%p' trunk/configure.ac)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+svndate=$(svn info trunk --show-item last-changed-date | cut -dT -f1 | tr -d -)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+svnrevision=$(svn info trunk --show-item last-changed-revision)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname="alienarena-$version-$svndate-r$svnrevision"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfile="$distname.tar.xz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if [ -f "$distfile" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf "%s already exists\n" "$distfile"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf "Creating %s\n" "$distfile"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mv trunk "$distname"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tar --exclude ".svn" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --exclude "*.dll" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --exclude "*.exe" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --exclude "*.ico" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --exclude "Tools" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --exclude "alienarena_w32.*" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --exclude "build" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --exclude "data1" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --exclude "lib_zipfiles" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --exclude "source/win32" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --exclude "vs2010" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --use-compress-program pixz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -cf "$distfile" "$distname"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mv "$distname" trunk
</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;'>+svndate=$(svn info trunk/data1 --show-item last-changed-date | cut -dT -f1 | tr -d -)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+svnrevision=$(svn info trunk/data1 --show-item last-changed-revision)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname="alienarena-data-$version-$svndate-r$svnrevision"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfile="$distname.tar.xz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if [ -f "$distfile" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf "%s already exists\n" "$distfile"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf "Creating %s\n" "$distfile"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkdir "$distname"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mv trunk/data1 "$distname"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tar --use-compress-program pixz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -cf "$distfile" "$distname"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mv "$distname/data1" trunk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmdir "$distname"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+fi
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/alienarena/files/patch-configure.ac.diff b/games/alienarena/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 416165296f0..cc71336a6c2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/alienarena/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/alienarena/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,9 @@
</span> Fix quoting and typos.
Also set gl_dlopen_path before using it.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2017-11-10 00:52:38.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2020-09-01 19:32:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -75,7 +75,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2020-09-01 21:37:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2020-09-01 23:48:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -76,7 +76,7 @@
</span>
dnl to avoid misleading error messages later
AS_IF([ test "x${PKG_CONFIG}" = x ],
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ Also set gl_dlopen_path before using it.
</span> [])
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -117,6 +117,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -118,6 +118,19 @@
</span> AC_DEFINE_UNQUOTED([CPUSTRING], "${host_cpu}", [Canonical CPU identification])
AC_DEFINE_UNQUOTED([BUILDSTRING], "${host_os}", [Canonical OS identification])
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +32,7 @@ Also set gl_dlopen_path before using it.
</span> dnl
dnl Set names of dlopened libraries for config.h
dnl The Darwin configuration attempts to conform to MacPorts.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -136,7 +149,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -137,7 +150,7 @@
</span> ])
AC_DEFINE_UNQUOTED([OPENAL_DRIVER],
["@PREFIX@/lib/libopenal.dylib"],
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,7 @@ Also set gl_dlopen_path before using it.
</span> ],[
AC_DEFINE_UNQUOTED([OPENGL_DRIVER],
["libGL.so.1"],[OpenGL shared lib name])
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -214,27 +227,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -229,27 +242,14 @@
</span> dnl ---- pthread (client)
AX_PTHREAD([],
[AC_MSG_ERROR(
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,7 +71,7 @@ Also set gl_dlopen_path before using it.
</span> ])
dnl ---- xf86vm (client)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -323,31 +323,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -338,26 +338,26 @@
</span>
dnl ---- libjpeg (client)
AC_SEARCH_LIBS([jpeg_read_header],[jpeg],,[
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,14 +102,8 @@ Also set gl_dlopen_path before using it.
</span> + AC_MSG_ERROR([required FreeType2 library not found])
])
<span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl ---- ODE (client)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PKG_CHECK_MODULES( [ODE],[ode],,[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_MSG_ERROR(["Required ODE (Open Dynamics Engine) library not found"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_MSG_ERROR([required ODE (Open Dynamics Engine) library not found])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -406,28 +406,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -442,29 +442,29 @@
</span> jpeglib_h_found=no
AC_CHECK_HEADERS([jpeglib.h jpeg/jpeglib.h],[ jpeglib_h_found=yes ])
AS_IF([ test "x${jpeglib_h_found}" = xno ],
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,9 +132,10 @@ Also set gl_dlopen_path before using it.
</span> + [AC_MSG_ERROR([required OpenGL header file, glx.h, not found])])
dnl ---- ODE (client)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_HEADERS([ode/ode.h],,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [AC_MSG_ERROR("Required ODE header file, ode.h, not found.")]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [AC_MSG_ERROR([required ODE header file, ode.h, not found])]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AS_IF([ test "x$system_libode" = "xyes"],[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_HEADERS([ode/ode.h],,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [AC_MSG_ERROR("with-system-libode: Required ODE header file, ode.h, not found.")]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [AC_MSG_ERROR([with-system-libode: required ODE header file, ode.h, not found])]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [
</span> #define dDOUBLE
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/alienarena/files/patch-source-Makefile.am.diff b/games/alienarena/files/patch-source-Makefile.am.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..565361333dc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/alienarena/files/patch-source-Makefile.am.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Avoid making an empty libode.a, which is not allowed on macOS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(ar: no archive members specified)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- source/Makefile.am.orig 2020-09-01 21:34:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ source/Makefile.am 2020-09-02 00:28:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,7 +15,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see the file, GPLv2.
</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;'>+-noinst_LIBRARIES = libgame.a libode.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++noinst_LIBRARIES = libgame.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if !USE_SYSTEM_LIBODE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++noinst_LIBRARIES += libode.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif
</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;'>+ # set location of `data1', etc
</span></pre><pre style='margin:0'>
</pre>