<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/cbe7c3de8fc9eaf7b0246c0d438da222de059635">https://github.com/macports/macports-ports/commit/cbe7c3de8fc9eaf7b0246c0d438da222de059635</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit cbe7c3de8fc9eaf7b0246c0d438da222de059635
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Sep 1 21:21:04 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> alienarena: Update to 7.70.0-20180721
</span>---
games/alienarena/Portfile | 128 ++++++++++--------
games/alienarena/files/patch-Makefile.am.diff | 7 -
games/alienarena/files/patch-configure.ac.diff | 175 ++++++++++++++++++++-----
3 files changed, 216 insertions(+), 94 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 4e33b987ede..1d3a8286afc 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;'>@@ -3,7 +3,11 @@
</span> PortSystem 1.0
name alienarena
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.66-20130827
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.70.0-20180721
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f2e081eb64324c0e3576bb2b796c46ecb9c2a079 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 100fee4494aa11cfc3fc846e9b3a0cb64e5eb134d1afaf802024d0fc7309c27b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 913540088
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set version_number [lindex [split ${version} -] 0]
set version_date [lindex [split ${version} -] 1]
categories games
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,14 +31,11 @@ long_description Alien Arena combines some of the very best aspects of \
</span> game experience.
homepage http://red.planetarena.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://icculus.org/alienarena/Files/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${homepage}files/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir alienarena-${version_number}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${worksrcdir}-linux${version_date}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f3183b9ce90b52d7e01379cfcf004ce3249384a5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 29086098eacb18319e6dcc9156355c44db4b1aa8a4f7b0bb63e6856d8128b012
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ${homepage}files/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir ${name}/${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_zip yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname AlienArena
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir Alien Arena
</span>
platform darwin {
if {${os.major} < 9} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,61 +53,75 @@ platform darwin {
</span>
if {${name} eq ${subport}} {
revision 0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup muniversal 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build port:autoconf-archive \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span>
depends_lib port:curl \
port:freetype \
port:jpeg \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libogg \
</span> port:libvorbis \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:openal-soft \
</span> port:mesa \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ode \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:openal-soft \
</span> port:xorg-libX11 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXext \
</span> port:xorg-libXxf86dga \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXxf86vm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXxf86vm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span>
depends_run port:alienarena-data
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Create list of data files we want to exclude.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.6.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${workpath} "${extract.cmd} ${extract.pre_args} [shellescape ${distpath}/${distfiles}] | tar -tf - --exclude '*.cfg' [shellescape ${worksrcdir}/data1] | grep -v /$ > datafiles.txt"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${workpath} "${extract.cmd} ${extract.pre_args} '${distpath}/${distfiles}' | tar -tf - --exclude '*.cfg' '${worksrcdir}/data1' | grep -v /$ > datafiles.txt"
</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;'>- # Avoid extracting data files.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extract.post_args-append -X datafiles.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --x-includes=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --x-libraries=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-system-libode \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-xf86dga \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-xf86vm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cflags-append -std=gnu89
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extract only the files we need: exclude Windows DLLs, EXEs, icons and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # source; Linux executables; the configure script that we'll regenerate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # anyway; and the game data that the alienarena-data subport installs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # MacPorts base doesn't let us change unzip args so we have to override.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TODO: Use shellescape once MacPorts 2.7.0 is out.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # autoreconf complains if this directory doesn't exist.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${worksrcpath}/data1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Make sure the port's version number is correct, since it's an
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # unversioned distfile.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fp [open ${worksrcpath}/configure.ac r]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set file_data [read ${fp}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close ${fp}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![regexp {AC_INIT\(\[alienarena\],\[([^]]+)\],} ${file_data} -> configure_version]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "version not found in configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "version not found"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure_version} ne ${version_number}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "port version ${version_number} doesn't match version in configure.ac ${configure_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "version mismatch"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-Makefile.am.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-configure.ac.diff
</span>
post-patch {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The @PREFIX@ placeholder is present in configure.ac as shipped by the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # developers. They mistakenly applied a MacPorts patch (that added that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # placeholder to use MacPorts openal-soft instead of Apple's OpenAL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # framework) that was never meant for upstream consumption.
</span> reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/configure.ac
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The zip file contains a configure script but it's missing the execute bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # and none of the supporting files are present. Also, we patch configure.ac.
</span> use_autoreconf yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ autoreconf.args -fvi
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Prevent finding an installed version of ode which would cause a build error.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-replace -I${prefix}/include -isystem${prefix}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${prefix}/share/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/arena ${worksrcpath}/botinfo ${worksrcpath}/data1 ${destroot}${prefix}/share/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</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-xf86dga \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-xf86vm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-data1pkg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --x-includes=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --x-libraries=${prefix}/lib
</span>
variant debug description {Enable debugging symbols} {
configure.args-append --enable-debugging-symbols
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,10 +138,10 @@ To run your own dedicated Alien Arena server, use:
</span> ${name}-ded
"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.version ${version_number}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.version [regsub {(....)(..)(..)} ${version_date} {\1-\2-\3}]
</span> livecheck.type regex
<span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.url ${homepage}aquire.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex ${name}-(\[0-9.\]+)-linux\[0-9\]+${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.url [lindex ${master_sites} 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.regex {>AlienArena\.zip</a>[[:space:]]*</td><td[^>]*>([0-9-]+)}
</span> } else {
livecheck.type none
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,18 +153,17 @@ subport alienarena-data {
</span>
description Assets for the Alien Arena game
<span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${description}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Extract only the data1 directory, minus its .cfg files.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extract.post_args-append --exclude '*.cfg' ${worksrcdir}/data1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description {*}${description}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ worksrcdir {*}${worksrcdir}/data1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${prefix}/share/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/data1 ${destroot}${prefix}/share/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extract only the data1 directory.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # MacPorts base doesn't let us change unzip args so we have to override.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TODO: Use shellescape once MacPorts 2.7.0 is out.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${workpath} "unzip -q '${distpath}/${distfiles}' '${worksrcdir}/*'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The configure script doesn't have the execute bit.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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/patch-Makefile.am.diff b/games/alienarena/files/patch-Makefile.am.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index dc24f7f1b62..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/alienarena/files/patch-Makefile.am.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.am.orig 2012-12-18 00:18:47.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.am 2013-02-08 11:09:34.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -97,4 +97,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</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;'>--include game_data.am
</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 c0cdc9f243e..416165296f0 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,31 +1,146 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2013-08-26 13:31:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2013-10-16 02:10:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -94,7 +94,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Environment variable for specifying libGL.dylib path for Darwin when it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # is not in the dlopen() search path. see dlopen (3) for Mac OS X.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Either export or in command line: GL_LIBDIR=/usr/Xll/lib, for example.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Either export or in command line: GL_LIBDIR=/usr/X11/lib, for example.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # If this GL_LIBDIR is not given, use the shell variable x_libraries from
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the AC_PATH_X macro (which may be empty)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix quoting and typos.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Also set gl_dlopen_path before using it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2017-11-10 00:52:38.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2020-09-01 19:32:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -75,7 +75,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl to avoid misleading error messages later
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AS_IF([ test "x${PKG_CONFIG}" = x ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [AC_MSG_ERROR([required pkg-config utility not found.])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [AC_MSG_ERROR([required pkg-config utility not found])],
</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:#ffe0e0;'>-@@ -515,7 +515,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [AS_IF([ test x"${gl_dlopen_path}" = xdefault ],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [AC_DEFINE([OPENGL_DRIVER],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ["libGL.dylib"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [OpenAL dynamic lib name])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [OpenGL dynamic lib name])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [AC_DEFINE_UNQUOTED([OPENGL_DRIVER],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ["${gl_dlopen_path}/libGL.dylib"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -523,8 +523,8 @@
</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;'>- AC_DEFINE([OPENAL_DRIVER],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ["/System/Library/Frameworks/OpenAL.framework/OpenAL"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [OpenAl dynamic lib path])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ["@PREFIX@/lib/libopenal.dylib"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [OpenAL dynamic lib path])
</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:#e0ffe0;'>+@@ -117,6 +117,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_DEFINE_UNQUOTED([CPUSTRING], "${host_cpu}", [Canonical CPU identification])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_DEFINE_UNQUOTED([BUILDSTRING], "${host_os}", [Canonical OS identification])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dnl ---- Darwin search for OpenGL library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dnl (ref: dlopen(3) for Mac OS X.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dnl See Darwin notes above.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++gl_dlopen_path=default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AS_IF([ test "x${unix_host}" = xdarwin ],[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_CHECKING([for GL_LIBDIR (location of libGL.dylib)])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_ARG_VAR( GL_LIBDIR, [directory containing libGL.dylib])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_RESULT([${GL_LIBDIR}])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AS_IF([ test "x${GL_LIBDIR}" = x ],[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gl_dlopen_path=${x_libraries}],[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gl_dlopen_path=${GL_LIBDIR}])
</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;'>+ dnl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl Set names of dlopened libraries for config.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl The Darwin configuration attempts to conform to MacPorts.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -136,7 +149,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_DEFINE_UNQUOTED([OPENAL_DRIVER],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ["@PREFIX@/lib/libopenal.dylib"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [OpenAl dynamic lib path])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [OpenAL dynamic lib path])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ],[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_DEFINE_UNQUOTED([OPENGL_DRIVER],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ["libGL.so.1"],[OpenGL shared lib name])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -214,27 +227,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl ---- pthread (client)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AX_PTHREAD([],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [AC_MSG_ERROR(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ["Required pthreads support not found (or invalid CFLAGS)."])])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [required pthreads support not found (or invalid CFLAGS)])])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl This might be a workaround for DSO missing pthread library error:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AS_IF([ test "x${PTHREAD_LIBS}" = x ],[PTHREAD_LIBS="-pthread"])
</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;'>+-dnl ---- Darwin search for OpenGL library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dnl (ref: dlopen(3) for Mac OS X.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dnl See Darwin notes above.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-gl_dlopen_path=default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AS_IF([ test "x${unix_host}" = xdarwin ],[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_CHECKING([for GL_LIBDIR (location of libGL.dylib)])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_ARG_VAR( GL_LIBDIR, [directory containing libGL.dylib])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_RESULT([${GL_LIBDIR}])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AS_IF([ test "x${GL_LIBDIR}" = x ],[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gl_dlopen_path=${x_libraries}],[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gl_dlopen_path=${GL_LIBDIR}])
</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;'>+ dnl ---- X11 (client)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CHECK_MODULES([X11],[x11],,[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_ERROR(["Required Xll library not found"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_ERROR([required X11 library not found])
</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;'>+ dnl ---- xf86vm (client)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -323,31 +323,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl ---- libjpeg (client)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SEARCH_LIBS([jpeg_read_header],[jpeg],,[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_ERROR(["Required jpeg library not found"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_ERROR([required jpeg library not found])
</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;'>+ dnl ---- libcurl (client)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CHECK_MODULES([LIBCURL],[libcurl],,[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_ERROR(["Required cURL library not found"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_ERROR([required cURL library not found])
</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;'>+ dnl ---- ogg, vorbis, vorbisfile (client)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CHECK_MODULES([OGG],[ogg],,[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_ERROR(["Required Ogg libraries not found"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_ERROR([required Ogg libraries not found])
</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;'>+ PKG_CHECK_MODULES([VORBIS],[vorbis vorbisfile],,[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_ERROR(["Required Vorbis libraries not found"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_ERROR([required Vorbis libraries not found])
</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;'>+ dnl ---- freetype2 (client)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CHECK_MODULES([FREETYPE2],[freetype2],,[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_ERROR(["Required FreeType2 library not found"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_ERROR([required FreeType2 library not found])
</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;'>+ dnl ---- ODE (client)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CHECK_MODULES( [ODE],[ode],,[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_ERROR(["Required ODE (Open Dynamics Engine) library not found"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_ERROR([required ODE (Open Dynamics Engine) library not found])
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -406,28 +406,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jpeglib_h_found=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_HEADERS([jpeglib.h jpeg/jpeglib.h],[ jpeglib_h_found=yes ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AS_IF([ test "x${jpeglib_h_found}" = xno ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [AC_MSG_ERROR("Required JPEG header file, jpeglib.h, not found.")])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [AC_MSG_ERROR([required JPEG header file, jpeglib.h, not found])])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl ---- OpenAL (client)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openal_h_found=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_HEADERS([AL/al.h al.h OpenAL/al.h],[ openal_h_found=yes ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AS_IF([ test "x${openal_h_found}" = xno ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [AC_MSG_ERROR("Required OpenAL header file, al.h, not found.")])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [AC_MSG_ERROR([required OpenAL header file, al.h, not found])])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openalc_h_found=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_HEADERS([AL/alc.h alc.h OpenAL/alc.h],[ openalc_h_found=yes ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AS_IF([ test "x${openalc_h_found}" = xno ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [AC_MSG_ERROR("Required OpenAL header file, alc.h, not found.")])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [AC_MSG_ERROR([required OpenAL header file, alc.h, not found])])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl ---- OpenGL (client)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_HEADERS([GL/gl.h],,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [AC_MSG_ERROR("Required OpenGL header file, gl.h, not found.")])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [AC_MSG_ERROR([required OpenGL header file, gl.h, not found])])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_HEADERS([GL/glx.h],,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [AC_MSG_ERROR("Required OpenGL header file, glx.h, not found.")])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [AC_MSG_ERROR([required OpenGL header file, glx.h, not found])])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl ---- ODE (client)
</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("Required ODE header file, ode.h, not found.")]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [AC_MSG_ERROR([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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define dDOUBLE
</span></pre><pre style='margin:0'>
</pre>