<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9aa810b0622edf66a8452955dd83d09a6a98aa37">https://github.com/macports/macports-ports/commit/9aa810b0622edf66a8452955dd83d09a6a98aa37</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 9aa810b0622 boswars: use lua PG
</span>9aa810b0622 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9aa810b0622edf66a8452955dd83d09a6a98aa37
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Mar 12 04:48:53 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> boswars: use lua PG
</span>---
games/boswars/Portfile | 6 ++++--
games/boswars/files/build_options.py | 4 ++--
games/boswars/files/patch-SConstruct.diff | 14 --------------
3 files changed, 6 insertions(+), 18 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/boswars/Portfile b/games/boswars/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 320c768a77c..023df3295c3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/boswars/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/boswars/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup lua 1.0
</span>
name boswars
version 2.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories games
maintainers nomaintainer
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,9 +49,10 @@ depends_lib port:libogg \
</span> port:libsdl \
port:libtheora \
port:libvorbis \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lua51 \
</span> port:zlib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+lua.version 5.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> license_noconflict scons
extract.only ${distname}${extract.suffix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/boswars/files/build_options.py b/games/boswars/files/build_options.py
</span><span style='display:block; white-space:pre;color:#808080;'>index 0469a75bec1..895f4031020 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/boswars/files/build_options.py
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/boswars/files/build_options.py
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> # put lua51 include path before macports in case lua 5.2 is installed
<span style='display:block; white-space:pre;background:#ffe0e0;'>-CPPPATH = ['__PREFIX__/include/lua-5.1', '__PREFIX__/include']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+CPPPATH = ['__PREFIX__/include/lua5.1', '__PREFIX__/include']
</span> CPPDEFINES = []
<span style='display:block; white-space:pre;background:#ffe0e0;'>-LIBPATH = ['__PREFIX__/lib/lua-5.1', '__PREFIX__/lib']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+LIBPATH = ['__PREFIX__/lib/lua5.1', '__PREFIX__/lib']
</span> CCFLAGS = ['-fsigned-char']
LINKFLAGS = ['$__RPATH']
CC = ['__CC__']
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/boswars/files/patch-SConstruct.diff b/games/boswars/files/patch-SConstruct.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6e831a8fa54..27edbe7c139 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/boswars/files/patch-SConstruct.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/boswars/files/patch-SConstruct.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,20 +9,6 @@
</span> return static_libs
if function is None:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -170,11 +170,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def CheckLuaLib(env, conf):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not 'USE_WIN32' in env['CPPDEFINES']:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if env.WhereIs('pkg-config'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for packagename in ['lua5.1', 'lua51', 'lua']:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for packagename in ['lua-5.1', 'lua51', 'lua']:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exitcode,_ = ParseConfig(env, 'pkg-config --cflags --libs ' + packagename)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if exitcode == 0:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if conf.CheckLibWithHeader('lua51', 'lua.h', 'c'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if conf.CheckLibWithHeader('lua-5.1', 'lua.h', 'c'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if conf.CheckLibWithHeader('lua5.1', 'lua.h', 'c'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1
</span> @@ -190,20 +190,20 @@
## check for required libs ##
</pre><pre style='margin:0'>
</pre>