<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[121069] trunk/dports/games/boswars</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/121069">121069</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-06-16 14:08:37 -0700 (Mon, 16 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>boswars: update to version 2.7, depends on lua51, install fixed images for libpng16 (#42197).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgamesboswarsPortfile">trunk/dports/games/boswars/Portfile</a></li>
<li><a href="#trunkdportsgamesboswarsfilespatchSConstructdiff">trunk/dports/games/boswars/files/patch-SConstruct.diff</a></li>
<li><a href="#trunkdportsgamesboswarsfilespatchengine_video_graphiccppdiff">trunk/dports/games/boswars/files/patch-engine_video_graphic.cpp.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgamesboswarsfilesbuild_optionspy">trunk/dports/games/boswars/files/build_options.py</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgamesboswarsfilespatchbuild_optionspydiff">trunk/dports/games/boswars/files/patch-build_options.py.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgamesboswarsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/games/boswars/Portfile (121068 => 121069)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/games/boswars/Portfile 2014-06-16 20:02:46 UTC (rev 121068)
+++ trunk/dports/games/boswars/Portfile 2014-06-16 21:08:37 UTC (rev 121069)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name boswars
</span><del>-version 2.6.1
-revision 1
</del><ins>+version 2.7
</ins><span class="cx"> categories games
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers nomaintainer
</span><span class="lines">@@ -22,36 +21,65 @@
</span><span class="cx"> allow for different strategies.
</span><span class="cx">
</span><span class="cx"> homepage http://boswars.org/
</span><del>-master_sites ${homepage}dist/releases/
</del><ins>+master_sites ${homepage}dist/releases:boswars \
+ http://dev.gentoo.org/~hasufell/distfiles:images
+
+set imagefile boswars-${version}-fixed-images-for-libpng-1.6.tar.xz
+
</ins><span class="cx"> distname ${name}-${version}-src
</span><ins>+distfiles ${distname}${extract.suffix}:boswars \
+ ${imagefile}:images
</ins><span class="cx">
</span><del>-checksums rmd160 f7c41b3c9276d21aab19e93af0de851646dc4bac \
- sha256 6003307692bde9913f6b5c227bf351e43e33d44ffaab198f0d0677e8fef86315
</del><ins>+checksums ${distname}${extract.suffix} \
+ rmd160 8a22afb974452d5290e4023f801752b8f2defe04 \
+ sha256 dc3718f531e9ea413cf37e1333b62a4c5e69f1405502d9c59b9e424635135e3e \
+ ${imagefile} \
+ rmd160 4354ab05348d2827ec17eeac472b03e854bcdaa7 \
+ sha256 87f3ee7f4045c3acfacd884348a2b376e710b42aa0f40acbc212732d0bee9a24
</ins><span class="cx">
</span><del>-depends_build port:scons
</del><ins>+depends_extract-append port:xz
</ins><span class="cx">
</span><ins>+depends_build port:pkgconfig \
+ port:scons
+
</ins><span class="cx"> depends_lib port:libogg \
</span><span class="cx"> port:libpng \
</span><span class="cx"> port:libsdl \
</span><span class="cx"> port:libtheora \
</span><span class="cx"> port:libvorbis \
</span><del>- port:lua \
</del><ins>+ port:lua51 \
</ins><span class="cx"> port:zlib
</span><span class="cx">
</span><span class="cx"> license_noconflict scons
</span><span class="cx">
</span><ins>+extract.only ${distname}${extract.suffix}
+
+# image files shipped with boswar are built with libpng15
+# replace with fixed images built with libpng16
+
+post-extract {
+ system "cd ${worksrcpath} && \
+ ${prefix}/bin/xz -dc '${prefix}/var/macports/distfiles/${name}/${imagefile}' | /usr/bin/gnutar --no-same-owner --strip-components 1 -xf -"
+}
+
+pre-patch {
+ xinstall ${portpath}/${filesdir}/build_options.py ${worksrcpath}
+}
+
</ins><span class="cx"> patchfiles patch-SConstruct.diff \
</span><del>- patch-build_options.py.diff \
</del><span class="cx"> patch-engine_video_graphic.cpp.diff
</span><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/build_options.py
</span><ins>+ reinplace "s|__CC__|${configure.cc}|g" ${worksrcpath}/build_options.py
+ reinplace "s|__CXX__|${configure.cxx}|g" ${worksrcpath}/build_options.py
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> use_configure no
</span><ins>+universal_variant no
</ins><span class="cx">
</span><span class="cx"> build {
</span><del>- system -W ${worksrcpath} "${prefix}/bin/scons debug"
</del><ins>+ system -W ${worksrcpath} "${prefix}/bin/scons"
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> destroot {
</span><span class="lines">@@ -61,7 +89,7 @@
</span><span class="cx"> # Rename the boswars binary to boswars-bin and install it in destroot so a
</span><span class="cx"> # helper script can be used which automatically sets the path to the
</span><span class="cx"> # boswars files.
</span><del>- move ${worksrcpath}/boswars-debug ${destroot}${prefix}/bin/boswars-bin
</del><ins>+ move ${worksrcpath}/build/boswars-release ${destroot}${prefix}/bin/boswars-bin
</ins><span class="cx"> # Copy the helper script to ${prefix}/bin.
</span><span class="cx"> xinstall ${portpath}/${filesdir}/boswars ${destroot}${prefix}/bin
</span><span class="cx"> # Set the correct path to the boswars files in the boswars helper script.
</span></span></pre></div>
<a id="trunkdportsgamesboswarsfilesbuild_optionspy"></a>
<div class="addfile"><h4>Added: trunk/dports/games/boswars/files/build_options.py (0 => 121069)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/games/boswars/files/build_options.py (rev 0)
+++ trunk/dports/games/boswars/files/build_options.py 2014-06-16 21:08:37 UTC (rev 121069)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+# put lua51 include path before macports in case lua 5.2 is installed
+CPPPATH = ['__PREFIX__/include/lua-5.1', '__PREFIX__/include']
+CPPDEFINES = []
+LIBPATH = ['__PREFIX__/lib']
+CCFLAGS = ['-fsigned-char']
+LINKFLAGS = ['$__RPATH']
+CC = ['__CC__']
+CXX = ['__CXX__']
+MINGWCPPPATH = []
+MINGWLIBPATH = []
</ins></span></pre></div>
<a id="trunkdportsgamesboswarsfilespatchSConstructdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/games/boswars/files/patch-SConstruct.diff (121068 => 121069)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/games/boswars/files/patch-SConstruct.diff 2014-06-16 20:02:46 UTC (rev 121068)
+++ trunk/dports/games/boswars/files/patch-SConstruct.diff 2014-06-16 21:08:37 UTC (rev 121069)
</span><span class="lines">@@ -1,11 +1,25 @@
</span><del>---- SConstruct 2008-01-27 18:27:52.000000000 +0100
-+++ SConstruct 2008-01-27 18:28:00.000000000 +0100
-@@ -303,7 +303,7 @@
</del><ins>+--- SConstruct.orig 2013-06-02 05:41:11.000000000 -0700
++++ SConstruct 2014-06-15 06:55:46.000000000 -0700
+@@ -170,11 +170,11 @@
+ def CheckLuaLib(env, conf):
+ if not 'USE_WIN32' in env['CPPDEFINES']:
+ if env.WhereIs('pkg-config'):
+- for packagename in ['lua5.1', 'lua51', 'lua']:
++ for packagename in ['lua-5.1', 'lua51', 'lua']:
+ exitcode,_ = ParseConfig(env, 'pkg-config --cflags --libs ' + packagename)
+ if exitcode == 0:
+ break
+- if conf.CheckLibWithHeader('lua51', 'lua.h', 'c'):
++ if conf.CheckLibWithHeader('lua-5.1', 'lua.h', 'c'):
+ return 1
+ if conf.CheckLibWithHeader('lua5.1', 'lua.h', 'c'):
+ return 1
+@@ -285,7 +285,7 @@
</ins><span class="cx">
</span><del>- debug = env.Copy()
</del><ins>+ debug = env.Clone()
</ins><span class="cx"> debug.Append(CPPDEFINES = 'DEBUG')
</span><span class="cx"> -debug.Append(CCFLAGS = Split('-g -Wsign-compare -Wall -Werror'))
</span><span class="cx"> +debug.Append(CCFLAGS = Split('-g -Wsign-compare -Wall'))
</span><span class="cx">
</span><del>- profile = debug.Copy()
</del><ins>+ profile = debug.Clone()
</ins><span class="cx"> profile.Append(CCFLAGS = Split('-pg'))
</span></span></pre></div>
<a id="trunkdportsgamesboswarsfilespatchbuild_optionspydiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/games/boswars/files/patch-build_options.py.diff (121068 => 121069)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/games/boswars/files/patch-build_options.py.diff 2014-06-16 20:02:46 UTC (rev 121068)
+++ trunk/dports/games/boswars/files/patch-build_options.py.diff 2014-06-16 21:08:37 UTC (rev 121069)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>---- build_options.py 1970-01-01 01:00:00.000000000 +0100
-+++ build_options.py 2008-01-27 16:42:37.000000000 +0100
-@@ -0,0 +1,9 @@
-+CPPPATH = ['__PREFIX__/include']
-+CPPDEFINES = []
-+LIBPATH = ['__PREFIX__/lib']
-+CCFLAGS = ['-fsigned-char']
-+LINKFLAGS = ['$__RPATH']
-+CC = 'gcc'
-+CXX = 'g++'
-+MINGWCPPPATH = []
-+MINGWLIBPATH = []
</del></span></pre></div>
<a id="trunkdportsgamesboswarsfilespatchengine_video_graphiccppdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/games/boswars/files/patch-engine_video_graphic.cpp.diff (121068 => 121069)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/games/boswars/files/patch-engine_video_graphic.cpp.diff 2014-06-16 20:02:46 UTC (rev 121068)
+++ trunk/dports/games/boswars/files/patch-engine_video_graphic.cpp.diff 2014-06-16 21:08:37 UTC (rev 121069)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- engine/video/graphic.cpp 2008-01-27 17:33:20.000000000 +0100
-+++ engine/video/graphic.cpp 2008-01-27 17:33:37.000000000 +0100
-@@ -852,8 +852,8 @@
</del><ins>+--- engine/video/graphic.cpp.orig 2013-06-02 05:41:06.000000000 -0700
++++ engine/video/graphic.cpp 2014-06-16 09:32:13.000000000 -0700
+@@ -986,8 +986,8 @@
</ins><span class="cx"> ckey = f->colorkey;
</span><span class="cx">
</span><span class="cx"> glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
</span></span></pre>
</div>
</div>
</body>
</html>