CVS commit: pkgsrc/games/bastet

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Sat Oct 15 00:45:15 UTC 2016

Modified Files:
        pkgsrc/games/bastet: Makefile distinfo
Added Files:
        pkgsrc/games/bastet/patches: patch-Makefile
Removed Files:
        pkgsrc/games/bastet/patches: patch-aa patch-ab patch-ac

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/games/bastet/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/games/bastet/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/games/bastet/patches/patch-Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/games/bastet/patches/patch-aa \
    pkgsrc/games/bastet/patches/patch-ac
cvs rdiff -u -r1.2 -r0 pkgsrc/games/bastet/patches/patch-ab

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/bastet/Makefile
diff -u pkgsrc/games/bastet/Makefile:1.7 pkgsrc/games/bastet/Makefile:1.8
--- pkgsrc/games/bastet/Makefile:1.7    Tue Aug 18 07:31:08 2015
+++ pkgsrc/games/bastet/Makefile        Sat Oct 15 00:45:15 2016
@@ -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"

Index: pkgsrc/games/bastet/distinfo
diff -u pkgsrc/games/bastet/distinfo:1.5 pkgsrc/games/bastet/distinfo:1.6
--- pkgsrc/games/bastet/distinfo:1.5    Tue Nov  3 20:56:44 2015
+++ pkgsrc/games/bastet/distinfo        Sat Oct 15 00:45:15 2016
@@ -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

Added files:

Index: pkgsrc/games/bastet/patches/patch-Makefile
diff -u /dev/null pkgsrc/games/bastet/patches/patch-Makefile:1.1
--- /dev/null   Sat Oct 15 00:45:15 2016
+++ pkgsrc/games/bastet/patches/patch-Makefile  Sat Oct 15 00:45:15 2016
@@ -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