<!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>[154186] trunk/dports/games/blobwars</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 { white-space: pre-line; 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/154186">154186</a></dd>
<dt>Author</dt> <dd>khindenburg@macports.org</dd>
<dt>Date</dt> <dd>2016-10-23 19:53:48 +0200 (Sun, 23 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>blobwars: update to 2.00
- update depends to sdl2
- build/install pak file
- verified plays fine on 10.12</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgamesblobwarsPortfile">trunk/dports/games/blobwars/Portfile</a></li>
<li><a href="#trunkdportsgamesblobwarsfilespatchmakefilediff">trunk/dports/games/blobwars/files/patch-makefile.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgamesblobwarsfilespatchsrc_pakhdiff">trunk/dports/games/blobwars/files/patch-src_pak.h.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgamesblobwarsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/games/blobwars/Portfile (154185 => 154186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/games/blobwars/Portfile 2016-10-23 16:39:30 UTC (rev 154185)
+++ trunk/dports/games/blobwars/Portfile 2016-10-23 17:53:48 UTC (rev 154186)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortGroup app 1.0
</span><span class="cx">
</span><span class="cx"> name blobwars
</span><del>-version 1.19
</del><ins>+version 2.00
</ins><span class="cx"> categories games
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers nomaintainer
</span><span class="lines">@@ -23,22 +23,26 @@
</span><span class="cx"> homepage http://www.parallelrealities.co.uk/p/blob-wars-metal-blob-solid.html
</span><span class="cx"> master_sites sourceforge:project/blobwars
</span><span class="cx">
</span><del>-checksums rmd160 39a2bf865e7c2af97dcb2d26e06604e8d1fcc62f \
- sha256 f9bafe59ead9e370ceaba4aae3d280241bf05fa06c8ae006eec0322c2fe9e2ed
</del><ins>+checksums rmd160 c4a54ce0f64db2fc6038590eb22d1b2241b0917f \
+ sha256 c406279f6cdf2aed3c6edb8d8be16efeda0217494acd525f39ee2bd3e77e4a99
</ins><span class="cx">
</span><del>-depends_lib port:gettext \
- port:libsdl \
- port:libsdl_image \
- port:libsdl_ttf \
- port:libsdl_mixer \
- port:libsdl_net \
</del><ins>+depends_build-append path:bin/pkg-config:pkgconfig
+
+depends_lib-append port:gettext \
+ port:libsdl2 \
+ port:libsdl2_image \
+ port:libsdl2_ttf \
+ port:libsdl2_mixer \
+ port:libsdl2_net \
</ins><span class="cx"> port:zlib
</span><span class="cx">
</span><span class="cx"> post-extract {
</span><span class="cx"> copy ${filespath}/${name}.in ${workpath}/${name}
</span><ins>+ system -W ${worksrcpath} "find . -type d -exec chmod 755 {} \\;"
+ system -W ${worksrcpath} "find . -type f -exec chmod 666 {} \\;"
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-patchfiles patch-makefile.diff patch-src_pak.h.diff
</del><ins>+patchfiles patch-makefile.diff
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|@PREFIX@|${prefix}|g" ${workpath}/${name}
</span><span class="lines">@@ -51,7 +55,8 @@
</span><span class="cx"> use_parallel_build yes
</span><span class="cx"> build.args PREFIX=${prefix}
</span><span class="cx"> build.env CXX="${configure.cxx} [get_canonical_archflags cxx]" \
</span><del>- CFLAGS="${configure.cppflags}"
</del><ins>+ CFLAGS="${configure.cppflags}" \
+ USEPAK=1
</ins><span class="cx">
</span><span class="cx"> destroot.destdir PREFIX=${destroot}${prefix}
</span><span class="cx">
</span><span class="lines">@@ -58,6 +63,8 @@
</span><span class="cx"> post-destroot {
</span><span class="cx"> file delete -force ${destroot}${prefix}/share/applications \
</span><span class="cx"> ${destroot}${prefix}/share/icons
</span><ins>+
+ copy ${worksrcpath}/blobwars.pak ${destroot}${prefix}/share/games/${name}
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> app.name Blob Wars
</span></span></pre></div>
<a id="trunkdportsgamesblobwarsfilespatchmakefilediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/games/blobwars/files/patch-makefile.diff (154185 => 154186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/games/blobwars/files/patch-makefile.diff 2016-10-23 16:39:30 UTC (rev 154185)
+++ trunk/dports/games/blobwars/files/patch-makefile.diff 2016-10-23 17:53:48 UTC (rev 154186)
</span><span class="lines">@@ -1,31 +1,23 @@
</span><del>---- makefile.orig 2011-04-17 09:56:56.000000000 -0500
-+++ makefile 2014-10-15 13:57:31.000000000 -0500
-@@ -9,7 +9,7 @@
</del><ins>+--- Makefile 2015-11-21 17:18:19.000000000 -0500
++++ Makefile 2016-10-23 12:44:23.000000000 -0400
+@@ -8,8 +8,7 @@
+ RELEASE ?= 0
</ins><span class="cx"> USEPAK ?= 0
</span><span class="cx">
</span><del>- PREFIX ?= /usr
</del><ins>+-PREFIX ?= /usr
</ins><span class="cx"> -BINDIR ?= $(PREFIX)/games/
</span><span class="cx"> +BINDIR ?= $(PREFIX)/libexec/blobwars/
</span><span class="cx"> DATADIR ?= $(PREFIX)/share/games/blobwars/
</span><span class="cx"> DOCDIR ?= $(PREFIX)/share/doc/$(PROG)/
</span><span class="cx"> ICONDIR ?= $(PREFIX)/share/icons/hicolor/
</span><del>-@@ -21,8 +21,8 @@
- CXXFLAGS += `sdl-config --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK)
</del><ins>+@@ -21,8 +20,8 @@
+ CXXFLAGS += `pkg-config --cflags sdl2 SDL2_mixer SDL2_image SDL2_ttf SDL2_net` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK)
</ins><span class="cx"> CXXFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DUNIX -DGAMEPLAYMANUAL=\"$(DOCDIR)index.html\" -Wall
</span><span class="cx"> CXXFLAGS += -DLOCALEDIR=\"$(LOCALEDIR)\" -DMEDAL_SERVER_HOST=\"$(MEDAL_SERVER_HOST)\" -DMEDAL_SERVER_PORT=$(MEDAL_SERVER_PORT)
</span><span class="cx"> -CXXFLAGS += $(CFLAGS) -Werror
</span><del>--LIBS = `sdl-config --libs` -lSDL_mixer -lSDL_image -lSDL_ttf -lSDL_net -lz
</del><ins>+-LIBS = `pkg-config --libs sdl2 SDL2_mixer SDL2_image SDL2_ttf SDL2_net` -lz
</ins><span class="cx"> +CXXFLAGS += $(CFLAGS)
</span><del>-+LIBS = `sdl-config --libs` -lSDL_mixer -lSDL_image -lSDL_ttf -lSDL_net -lz -lintl
</del><ins>++LIBS = `pkg-config --libs sdl2 SDL2_mixer SDL2_image SDL2_ttf SDL2_net` -lz -lintl
+ PAKLIBS = -lz
</ins><span class="cx">
</span><span class="cx"> OBJS += CAudio.o
</span><del>- OBJS += CBoss.o
-@@ -85,7 +85,7 @@
- $(CXX) $(LIBS) $(GAMEOBJS) -o $(PROG)
-
- pak: $(PAKOBJS)
-- $(CXX) $(LIBS) $(PAKOBJS) -o pak
-+ $(CXX) -lz $(PAKOBJS) -o pak
-
- %.mo: %.po
- msgfmt -c -o $@ $<
</del></span></pre></div>
<a id="trunkdportsgamesblobwarsfilespatchsrc_pakhdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/games/blobwars/files/patch-src_pak.h.diff (154185 => 154186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/games/blobwars/files/patch-src_pak.h.diff 2016-10-23 16:39:30 UTC (rev 154185)
+++ trunk/dports/games/blobwars/files/patch-src_pak.h.diff 2016-10-23 17:53:48 UTC (rev 154186)
</span><span class="lines">@@ -1,7 +0,0 @@
</span><del>---- src/pak.h.orig 2009-02-01 22:34:45.000000000 +1100
-+++ src/pak.h 2011-07-30 22:49:14.000000000 +1000
-@@ -21,3 +21,4 @@
- #include <dirent.h>
-
- #include "headers.h"
-+#undef main
</del></span></pre>
</div>
</div>
</body>
</html>