[pkgsrc/trunk]: pkgsrc/games/bastet Update bastet from 0.41 to 0.43.1

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/games/bastet Update bastet from 0.41 to 0.43.1
From: kamil <kamil%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 06:08:49 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/c3842343abef
branches:  trunk
changeset: 353822:c3842343abef
user:      kamil <kamil%pkgsrc.org@localhost>
date:      Sat Oct 15 00:45:15 2016 +0000

description:
Update bastet from 0.41 to 0.43.1

pkgsrc changes:
 - Switch to GitHub framework
 - Update HOMEPAGE
 - Set LICENSE (GPLv3)
 - Upstream switched from C to C++
 - Require boost-libs and boost-headers
 - SETGIDGAME -> USE_GAMESGROUP
 - Need to fix VARBASE differently (now with SUBST framework)
 - Drop unneded patches
 - Enforce any curses library (with a patch)

upstream changelog
==================
==0.43.1==
Small fixes: appdata and desktop file, moved to an unordered_set header that
should work on most compilers. Should still port to autotools or something
similar sometimes in the future.

==0.43==
Complete code rewrite. As I go on trying to grok C++, algorithms and data
structures, and as I started to understand more of Peter's code, I found
it useful to rewrite all this stuff from scratch.
This should solve some issues and probably introduce new ones. Therefore this
version needs a lot of playtesting and bug-hunting.
The algorithm has been split into two, one with the next block preview (normal)
and one without (harder).
New and more sophisticated techniques are now used to write the  block-choosing
algorithms, which should not be fooled as easily as before.

diffstat:

 games/bastet/Makefile               |  26 ++++++++++++++++----------
 games/bastet/distinfo               |  14 ++++++--------
 games/bastet/patches/patch-Makefile |  15 +++++++++++++++
 games/bastet/patches/patch-aa       |  29 -----------------------------
 games/bastet/patches/patch-ab       |  16 ----------------
 games/bastet/patches/patch-ac       |  26 --------------------------
 6 files changed, 37 insertions(+), 89 deletions(-)

diffs (169 lines):

diff -r 5a5bdc472e4e -r c3842343abef games/bastet/Makefile
--- a/games/bastet/Makefile     Fri Oct 14 22:44:57 2016 +0000
+++ b/games/bastet/Makefile     Sat Oct 15 00:45:15 2016 +0000
@@ -1,28 +1,34 @@
-# $NetBSD: Makefile,v 1.7 2015/08/18 07:31:08 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.8 2016/10/15 00:45:15 kamil Exp $
 
-DISTNAME=              bastet-0.41
-PKGREVISION=           3
+DISTNAME=              bastet-0.43.1
 CATEGORIES=            games
-MASTER_SITES=          http://fph.altervista.org/prog/
-EXTRACT_SUFX=          .tgz
+MASTER_SITES=          ${MASTER_SITE_GITHUB:=fph/}
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://fph.altervista.org/prog/bastet.shtml
+HOMEPAGE=              http://fph.altervista.org/prog/bastet.html
 COMMENT=               Bastard Tetris
+LICENSE=               gnu-gpl-v3
 
 USE_TOOLS+=            gmake
-MAKE_FLAGS+=           BIN_PREFIX=${PREFIX}/bin/
-MAKE_FLAGS+=           DATA_PREFIX=${VARBASE}/games/
 BUILD_DEFS+=           VARBASE
 
-SETGIDGAME=            yes
+USE_GAMESGROUP=                yes
 SPECIAL_PERMS=         bin/bastet ${SETGID_GAMES_PERMS}
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man6
 
+USE_LANGUAGES= c++
+
+SUBST_CLASSES+=                vardir
+SUBST_STAGE.vardir=    pre-configure
+SUBST_FILES.vardir=    Config.cpp
+SUBST_MESSAGE.vardir=  Fixing VARBASE.
+SUBST_SED.vardir=      -e "s|/var/games|${VARBASE}/games|1"
+
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/bastet ${DESTDIR}${PREFIX}/bin/
        ${INSTALL_MAN} ${WRKSRC}/bastet.6 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/
 
+.include "../../devel/boost-headers/buildlink3.mk"
+.include "../../devel/boost-libs/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5a5bdc472e4e -r c3842343abef games/bastet/distinfo
--- a/games/bastet/distinfo     Fri Oct 14 22:44:57 2016 +0000
+++ b/games/bastet/distinfo     Sat Oct 15 00:45:15 2016 +0000
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 20:56:44 agc Exp $
+$NetBSD: distinfo,v 1.6 2016/10/15 00:45:15 kamil Exp $
 
-SHA1 (bastet-0.41.tgz) = 644a0f76adedef84946159520c1639ff0c6c47ec
-RMD160 (bastet-0.41.tgz) = 00801881e8ee5d42f91fe5f231d3151606032851
-SHA512 (bastet-0.41.tgz) = 49831cc6ff0dfae195e55f7dd17328faed730df1395c81c55eb38a5dbab5370b375da5f7f4b619544b37cdf29882b345f0453b5eff3a9468a0f562b83efb3eba
-Size (bastet-0.41.tgz) = 24195 bytes
-SHA1 (patch-aa) = 987f3ea4697eeebc0b955ee293586621c9f93d4d
-SHA1 (patch-ab) = ce2a671e0582fc227bac442186c9f8c1621db278
-SHA1 (patch-ac) = 01c31c8506180300bec74fbf3627784e25e0809c
+SHA1 (bastet-0.43.1.tar.gz) = 003e342df526211a9a811c2235a02b2d8288e020
+RMD160 (bastet-0.43.1.tar.gz) = dde16fd74747bbd9dcc3a9762c0e681b7c9318ce
+SHA512 (bastet-0.43.1.tar.gz) = b2b67cd5bcc015629bd679b2bce696bd9e944cd233c78a9d49f91d340cd57f36f17181ffee5637c5883d5d28d4a1e3378697c5015dfd1cdac55e4a893c025e6f
+Size (bastet-0.43.1.tar.gz) = 82802 bytes
+SHA1 (patch-Makefile) = e372e9c19166dbfb4b432e720a0c56990792297e
diff -r 5a5bdc472e4e -r c3842343abef games/bastet/patches/patch-Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/bastet/patches/patch-Makefile       Sat Oct 15 00:45:15 2016 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile,v 1.1 2016/10/15 00:45:15 kamil Exp $
+
+Link with standard curses library. Works on NetBSD.
+
+--- Makefile.orig      2014-05-29 18:47:50.000000000 +0000
++++ Makefile
+@@ -3,7 +3,7 @@ MAIN=main.cpp
+ TESTS=Test.cpp
+ PROGNAME=bastet
+ BOOST_PO?=-lboost_program_options
+-LDFLAGS+=-lncurses $(BOOST_PO)
++LDFLAGS+=-lcurses $(BOOST_PO)
+ #CXXFLAGS+=-ggdb -Wall
+ CXXFLAGS+=-DNDEBUG -Wall
+ #CXXFLAGS+=-pg
diff -r 5a5bdc472e4e -r c3842343abef games/bastet/patches/patch-aa
--- a/games/bastet/patches/patch-aa     Fri Oct 14 22:44:57 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2013/10/17 09:19:01 roy Exp $
-
-SunPro does not like non-static inline functions. BSD-based operating
-systems have <termios.h> instead of <termio.h>.
-
---- bast.c.orig        2004-10-15 23:58:52.000000000 +0200
-+++ bast.c     2006-09-14 23:14:36.540746472 +0200
-@@ -1,7 +1,11 @@
- #include <stdlib.h>
- #include <stdio.h>
--#include <ncurses.h>
-+#include <curses.h>
-+#if defined(__linux)
- #include <termio.h>
-+#else
-+#include <termios.h>
-+#endif
- #include <assert.h>
- #include <unistd.h>
- #include <string.h>
-@@ -39,7 +43,7 @@ void bast_clear()
- }
- 
- 
--inline unsigned char *wyx2pointer(char *well, int y, int x)
-+static inline unsigned char *wyx2pointer(char *well, int y, int x)
- {
-         return well + (y * WELL_WIDTH) + x;
- }
diff -r 5a5bdc472e4e -r c3842343abef games/bastet/patches/patch-ab
--- a/games/bastet/patches/patch-ab     Fri Oct 14 22:44:57 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2006/09/14 21:18:44 rillig Exp $
-
-delay[] is used in usleep, which only accepts numbers smaller than
-1_000_000.
-
---- game.c.orig        2004-10-15 23:58:52.000000000 +0200
-+++ game.c     2006-09-14 15:46:25.000000000 +0200
-@@ -66,7 +66,7 @@ unsigned char *well_data;
- 
- /* Delay before block drop one step down (usec).
-    We start at one sec. and then decreases the delay by 23% at each level. */
--const int delay[NO_LEVELS] = {1000000, 770000, 593000, 457000, 352000, 271000, 208000, 160000, 124000, 95000};
-+const int delay[NO_LEVELS] = {999999, 770000, 593000, 457000, 352000, 271000, 208000, 160000, 124000, 95000};
- 
- /* Window in which the action takes place. */
- WINDOW *well_win;
diff -r 5a5bdc472e4e -r c3842343abef games/bastet/patches/patch-ac
--- a/games/bastet/patches/patch-ac     Fri Oct 14 22:44:57 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2013/10/17 09:19:01 roy Exp $
-
-For one-time building, the dependencies are not needed.
-
---- Makefile.orig      2004-10-19 19:54:58.000000000 +0200
-+++ Makefile   2006-09-14 23:55:46.501239484 +0200
-@@ -11,8 +11,8 @@ HISCORE=bastet.scores
- GAME_USER=games
- 
- CC=gcc
--CFLAGS=-Wall -DHIGHSCORE_FILE=\"$(DATA_PREFIX)$(HISCORE)\"
--LDFLAGS=-lncurses
-+CFLAGS+=-Wall -DHIGHSCORE_FILE=\"$(DATA_PREFIX)$(HISCORE)\"
-+LDFLAGS+=-lcurses
- SOURCES=main.c game.c highscore.c bast.c
- EXNAME=bastet
- 
-@@ -26,8 +26,6 @@ $(EXNAME) : $(SOURCES:.c=.o)
- | sed 's/\($*\)\.o[ :]*/\1.o $@ : /g' > $@; \
- [ -s $@ ] || rm -f $@
- 
--include $(SOURCES:.c=.d)
--
- %.o: %.c
-       $(CC) $(CFLAGS) -c $< -o $@
-
Prev by Date: [pkgsrc/trunk]: pkgsrc/devel/ruby-ncurses Update HOMEPAGE, berlios.de to github
Next by Date: [pkgsrc/trunk]: pkgsrc/devel/p5-Test-Script Updated devel/p5-Test-Script to 1.14
Previous by Thread: [pkgsrc/trunk]: pkgsrc/devel/ruby-ncurses Update HOMEPAGE, berlios.de to github
Next by Thread: [pkgsrc/trunk]: pkgsrc/devel/p5-Test-Script Updated devel/p5-Test-Script to 1.14
Indexes:
Home | Main Index | Thread Index | Old Index