<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/a46715e022211a62eab3fef194845cda09bf0136">https://github.com/macports/macports-ports/commit/a46715e022211a62eab3fef194845cda09bf0136</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 a46715e toppler: Update to 1.1.6
</span>a46715e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a46715e022211a62eab3fef194845cda09bf0136
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Dec 5 22:04:12 2016 -0600
<span style='display:block; white-space:pre;color:#404040;'> toppler: Update to 1.1.6
</span>---
games/toppler/Portfile | 13 +++---
games/toppler/files/configdir.patch | 19 ++++++++
games/toppler/files/localedir.patch | 12 +++++
games/toppler/files/patch-Makefile.in.diff | 6 +--
games/toppler/files/time.patch | 71 ++++++++++++++++++++++++++++++
5 files changed, 113 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/toppler/Portfile b/games/toppler/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5adf96a..f63894b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/toppler/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/toppler/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup app 1.0
name toppler
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.1.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.1.6
</span> categories games
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,10 +19,10 @@ long_description In this game you have to help a cute little green animal \
</span> guard the tower.
homepage http://toppler.sourceforge.net/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/toppler/toppler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites sourceforge:project/toppler/toppler/${version}/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 1bea7cedc8857ade3f7c7ce8c2b6aaab076329e5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 26cab477cfc427827fc4dc584271148ba4d14b5a5f12c1752e262b795d814167
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 45691ff9057e22e6aeea413fc77e27561bc46b95 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7dbc2905389c2adba0f8c459f3319cf04045ba53ed407e273a50a3a67564cc45
</span>
depends_lib port:gettext \
port:libiconv \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,10 @@ depends_lib port:gettext \
</span> port:libsdl_mixer \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles configdir.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ localedir.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-Makefile.in.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ time.patch
</span>
configure.args --disable-sdltest \
--mandir=${prefix}/share/man \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/toppler/files/configdir.patch b/games/toppler/files/configdir.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a9b9838
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/toppler/files/configdir.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/toppler/bugs/18/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- decl.cc.orig 2012-12-22 05:02:06.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ decl.cc 2016-12-05 21:55:46.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -123,12 +123,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DIR *d = opendir(n);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!d) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (d == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkdir(n, S_IRWXU);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ closedir(d);
</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;'>+- closedir(d);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(n);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/toppler/files/localedir.patch b/games/toppler/files/localedir.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2e5ce40
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/toppler/files/localedir.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/toppler/bugs/17/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- main.cc.orig 2012-12-22 05:02:06.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ main.cc 2016-12-05 21:41:58.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -96,7 +96,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DIR *dir = opendir("locale");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bindtextdomain("toppler", dir == NULL ? LOCALEDIR : "locale");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- closedir(dir);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (dir != NULL) closedir(dir);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ textdomain("toppler");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/toppler/files/patch-Makefile.in.diff b/games/toppler/files/patch-Makefile.in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d08bc37..e3e929d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/toppler/files/patch-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/toppler/files/patch-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.in.orig 2011-03-06 14:00:43.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.in 2011-09-19 06:18:25.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1172,11 +1172,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.in.orig 2012-12-22 05:03:04.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.in 2016-12-05 20:07:16.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1233,11 +1233,9 @@
</span>
install-exec-hook:
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/toppler/files/time.patch b/games/toppler/files/time.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..facd322
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/toppler/files/time.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,71 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/toppler/bugs/16/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- bonus.cc.orig 2012-12-22 05:02:06.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ bonus.cc 2016-12-05 20:44:39.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,7 +48,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* current game time
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static Sint32 time;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static Sint32 currtime;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* current xposition, this is ongoing from tower to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * tower so that you continue where you've left of in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -62,10 +62,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* lets first calc the position of the tower on the screen */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Sint32 towerpos;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (time < gametime/2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- towerpos = -(4*time);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (currtime < gametime/2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ towerpos = -(4*currtime);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- towerpos = gametime * scrollerspeed - 4*time + SCREENWID + (SPR_SLICEWID*2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ towerpos = gametime * scrollerspeed - 4*currtime + SCREENWID + (SPR_SLICEWID*2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* draw the background layers */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scr_draw_bonus1(xpos, towerpos);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -75,7 +75,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scr_draw_torpedo(torpedoy, torpedox);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* output the submarine */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- scr_draw_submarine(subposy - 20, subposx, time % 9);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scr_draw_submarine(subposy - 20, subposx, currtime % 9);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* and the fishes */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (int b = 0; b < fishcnt; b++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -137,7 +137,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ torpedox = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* restart timer */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- time = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ currtime = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ key_readkey();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -254,22 +254,22 @@
</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;'>+ /* change towercolor in the middle of the game */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ((time > gametime/2) && !newtowercol) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((currtime > gametime/2) && !newtowercol) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scr_settowercolor(lev_towercol_red(), lev_towercol_green(), lev_towercol_blue());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ newtowercol = true;
</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;'>+ /* end of game, switch to automatic, stop scrolling */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (time == gametime) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (currtime == gametime) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ automatic = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((subposx == SUBM_TARGET_X) && (subposy == SUBM_TARGET_Y)) break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xpos +=4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xpos_ofs += 4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- time++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ currtime++;
</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;'>+- if (!((time + 20) & 0x3f)) ttsounds::instance()->startsound(SND_SONAR);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!((currtime + 20) & 0x3f)) ttsounds::instance()->startsound(SND_SONAR);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* display screen and wait */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ show();
</span></pre><pre style='margin:0'>
</pre>