<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/1940fe966fba9f0114fe58324b1720b802656baa">https://github.com/macports/macports-ports/commit/1940fe966fba9f0114fe58324b1720b802656baa</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 1940fe9 bzflag: update to 2.4.12
</span>1940fe9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1940fe966fba9f0114fe58324b1720b802656baa
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Nov 13 14:34:16 2017 +1100
<span style='display:block; white-space:pre;color:#404040;'> bzflag: update to 2.4.12
</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/31016
</span>---
games/bzflag/Portfile | 43 ++++++---------
games/bzflag/files/patch-configure | 63 ----------------------
games/bzflag/files/patch-include__bzfSDL.h | 10 ----
.../files/patch-src__platform__SDLDisplay.cxx | 20 -------
4 files changed, 16 insertions(+), 120 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/bzflag/Portfile b/games/bzflag/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 310b6c2..5d34027 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/bzflag/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/bzflag/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,46 +4,35 @@ PortSystem 1.0
</span> PortGroup app 1.0
name bzflag
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.0.16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.4.12
</span> categories games
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license LGPL-2.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license {LGPL-2.1 MPL-2}
</span>
description 3D tank game, multiplayer and internet gaming available
long_description BZFlag is a free multiplayer multiplatform 3D tank \
battle game. The name stands for Battle Zone capture Flag.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://bzflag.org
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://ftp.bzflag.org/bzflag/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sourceforge:project/bzflag/bzflag%20source/${version}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.bzflag.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://download.bzflag.org/bzflag/source/${version}/
</span> use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 161b973bee586d43ebff4695dfb8c359 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 08e3a839fb0e4919c9244dd886c5059c076e1349 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 9156642183b9b33c6509737cd8e40f4ad612a657
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6ea084cdcded82cc63dc9a0455bb631ad6454c56 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a8a13a58648798a6f6f969a2911cf21377fe45964f2edf46a327d1370ff1000d
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:curl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsdl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:c-ares
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:c-ares \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:curl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ncurses \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --mandir=${prefix}/share/man \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --libdir=${prefix}/lib/${name} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --includedir=${prefix}/include/${name} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-sdl-exec-prefix=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-sdltest \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-ccachetest \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} >= 10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-include__bzfSDL.h patch-src__platform__SDLDisplay.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --libdir=${prefix}/lib/${name} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-sdltest
</span>
app.name BZFlag
app.icon data/bzflag-256x256.png
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type sourceforge
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex bzflag-(\\d+(?:\\.\\d+)*)\\.tar\\.bz2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url https://download.bzflag.org/bzflag/source/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex {(\d+(?:\.\d+)*)/}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/bzflag/files/patch-configure b/games/bzflag/files/patch-configure
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ee1e17d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/bzflag/files/patch-configure
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,63 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2010-04-01 16:53:25.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2011-02-10 17:09:06.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25329,60 +25329,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test x$with_SDL = xyes ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { echo "$as_me:$LINENO: checking for SDL framework" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo $ECHO_N "checking for SDL framework... $ECHO_C" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- savedLDFLAGS="$LDFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LDFLAGS="$LDFLAGS -framework SDL"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- framework_SDL_flag_works=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cat >conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--cat confdefs.h >>conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--cat >>conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <SDL/SDL_version.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:#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;'>-- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--rm -f conftest.$ac_objext conftest$ac_exeext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if { (ac_try="$ac_link"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--case "(($ac_try" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *) ac_try_echo=$ac_try;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (eval "$ac_link") 2>conftest.er1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ac_status=$?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- grep -v '^ *+' conftest.er1 >conftest.err
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rm -f conftest.er1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cat conftest.err >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (exit $ac_status); } && {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- test -z "$ac_c_werror_flag" ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- test ! -s conftest.err
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } && test -s conftest$ac_exeext &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $as_test_x conftest$ac_exeext; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo "$as_me: failed program was:" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--sed 's/^/| /' conftest.$ac_ext >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- framework_SDL_flag_works=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- conftest$ac_exeext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { echo "$as_me:$LINENO: result: $framework_SDL_flag_works" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo "${ECHO_T}$framework_SDL_flag_works" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test x$framework_SDL_flag_works = xno ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LDFLAGS="$savedLDFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- with_SDL=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test x$with_SDL = xno ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/bzflag/files/patch-include__bzfSDL.h b/games/bzflag/files/patch-include__bzfSDL.h
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 103934e..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/bzflag/files/patch-include__bzfSDL.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/bzfSDL.h.orig 2009-07-16 17:02:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/bzfSDL.h 2009-07-16 17:03:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,7 +19,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ifdef HAVE_SDL_SDL_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <SDL/SDL.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <SDL/SDL_thread.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# include <SDL/SDL_getenv.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # else // autotools adds an SDL-specific include path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include "SDL.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include "SDL_thread.h"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/bzflag/files/patch-src__platform__SDLDisplay.cxx b/games/bzflag/files/patch-src__platform__SDLDisplay.cxx
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8eb0b4c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/bzflag/files/patch-src__platform__SDLDisplay.cxx
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/platform/SDLDisplay.cxx.orig 2009-07-16 17:11:21.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/platform/SDLDisplay.cxx 2009-07-16 17:13:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -314,7 +314,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Uint16 unicode = sdlEvent.key.keysym.unicode;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SDLKey sym = sdlEvent.key.keysym.sym;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SDLMod mod = sdlEvent.key.keysym.mod;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Uint16 mod = sdlEvent.key.keysym.mod;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- key.ascii = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- switch (sym) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -483,7 +483,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- key.ascii = unicode & 0x7F;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ((sym >= SDLK_FIRST) && (sym <= SDLK_DELETE))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((sym >= SDLK_UNKNOWN) && (sym <= SDLK_DELETE))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- key.ascii = sym;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if ((sym >= SDLK_KP0) && (sym <= SDLK_KP9))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- key.ascii = sym - 208; // translate to normal number
</span></pre><pre style='margin:0'>
</pre>