CVS commit: pkgsrc/games/monsterz

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Dec 14 17:11:08 UTC 2024

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

Log Message:
monsterz: update to 0.8.

- New maintainer since old upstream seems gone
- Ported to Python 3
- Drew new nose for green monster (SVG) to match old one better
- Regenerated PNG graphics from SVG file
- Compatibility with latest numpy


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/games/monsterz/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/games/monsterz/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/games/monsterz/patches/patch-Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/games/monsterz/patches/patch-aa
cvs rdiff -u -r1.2 -r0 pkgsrc/games/monsterz/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/monsterz/Makefile
diff -u pkgsrc/games/monsterz/Makefile:1.29 pkgsrc/games/monsterz/Makefile:1.30
--- pkgsrc/games/monsterz/Makefile:1.29 Sun Oct 29 17:56:02 2023
+++ pkgsrc/games/monsterz/Makefile      Sat Dec 14 17:11:08 2024
@@ -1,27 +1,33 @@
-# $NetBSD: Makefile,v 1.29 2023/10/29 17:56:02 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2024/12/14 17:11:08 wiz Exp $
 
-DISTNAME=              monsterz-0.7.1
-PKGREVISION=           9
+DISTNAME=              monsterz-0.8
 CATEGORIES=            games
-MASTER_SITES=          http://sam.zoy.org/monsterz/
+MASTER_SITES=          ${MASTER_SITE_GITHUB:=0-wiz-0/}
+GITHUB_TAG=            v${PKGVERSION_NOREV}
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://sam.zoy.org/monsterz/
+HOMEPAGE=              https://github.com/0-wiz-0/monsterz
 COMMENT=               Puzzle game similar to the famous Bejeweled or Zookeeper
+# closest match
+LICENSE=               public-domain
 
-DEPENDS+=              ${PYPKGPREFIX}-game-[0-9]*:../../devel/py27-game
+DEPENDS+=              ${PYPKGPREFIX}-game-[0-9]*:../../devel/py-game
 
 REPLACE_PYTHON=                        monsterz.py
-PYTHON_VERSIONS_ACCEPTED=      27
 
-MAKE_ENV+=             GAMEOWN=${GAMEOWN:Q}
-MAKE_ENV+=             GAMEGRP=${GAMEGRP:Q}
+MAKE_FLAGS+=           prefix=${PREFIX}
+MAKE_FLAGS+=           gamesdir=${PREFIX}/bin
+MAKE_FLAGS+=           scoredir=${VARBASE}/games
+MAKE_ENV+=             GAMEOWN=${GAMES_USER:Q}
+MAKE_ENV+=             GAMEGRP=${GAMES_GROUP:Q}
 MAKE_ENV+=             VARBASE=${VARBASE}
 
-SETGIDGAME=            yes
+USE_GAMESGROUP=                yes
 CONF_FILES_PERMS+=     /dev/null ${VARBASE}/games/monsterz \
                        ${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
 SPECIAL_PERMS=         bin/monsterz ${SETGID_GAMES_PERMS}
 
+BUILD_DEFS+=           VARBASE
+
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/games/monsterz/distinfo
diff -u pkgsrc/games/monsterz/distinfo:1.7 pkgsrc/games/monsterz/distinfo:1.8
--- pkgsrc/games/monsterz/distinfo:1.7  Tue Oct 26 10:44:15 2021
+++ pkgsrc/games/monsterz/distinfo      Sat Dec 14 17:11:08 2024
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 10:44:15 nia Exp $
+$NetBSD: distinfo,v 1.8 2024/12/14 17:11:08 wiz Exp $
 
-BLAKE2s (monsterz-0.7.1.tar.gz) = 2dbc8181d6e63a2004081f874902530744c95b7459891f7b82656cf8c6770556
-SHA512 (monsterz-0.7.1.tar.gz) = 62de125251a74e7ff237c90ad88e10a4953b8841251dfec45cc6b77f416677ef6d68cf4308c3190f65896b5bb1312934abd5e438f0341f08c02884585f0e4787
-Size (monsterz-0.7.1.tar.gz) = 1879537 bytes
-SHA1 (patch-aa) = e3b128540f8ce50bbd8fb0a3083b1c7297db1b64
-SHA1 (patch-ab) = 5d7dff54c6d462b2da6df681af254edb466796c4
+BLAKE2s (monsterz-0.8.tar.gz) = 91bbd724c8a97f10142ad24a05fa7051ce4e16b9995b3ff51bd7954977a2468d
+SHA512 (monsterz-0.8.tar.gz) = 2518246aa97499922efe88529656dde84d8f925fb88895d6de977fe63b424a7fec62a06c2757c54b3a87595f3be02b4ef6a82442338b9db67e007fed2e6c00f0
+Size (monsterz-0.8.tar.gz) = 2316029 bytes
+SHA1 (patch-Makefile) = cc67e869e053e3a900f9ca9cdb2f8dbda727b5a5

Added files:

Index: pkgsrc/games/monsterz/patches/patch-Makefile
diff -u /dev/null pkgsrc/games/monsterz/patches/patch-Makefile:1.1
--- /dev/null   Sat Dec 14 17:11:08 2024
+++ pkgsrc/games/monsterz/patches/patch-Makefile        Sat Dec 14 17:11:08 2024
@@ -0,0 +1,44 @@
+$NetBSD: patch-Makefile,v 1.1 2024/12/14 17:11:08 wiz Exp $
+
+Honor CFLAGS and LDFLAGS.
+Use pkgsrc installation tools.
+
+--- Makefile.orig      2024-12-14 16:55:09.000000000 +0000
++++ Makefile
+@@ -22,7 +22,7 @@ INKSCAPE = inkscape
+ all: monsterz
+ 
+ monsterz: monsterz.c
+-      $(CC) -Wall monsterz.c -DDATADIR=\"$(pkgdatadir)\" -DSCOREFILE=\"$(scorefile)\" -o monsterz
++      $(CC) $(LDFLAGS) $(CFLAGS) -Wall monsterz.c -DDATADIR=\"$(pkgdatadir)\" -DSCOREFILE=\"$(scorefile)\" -o monsterz
+ 
+ bitmap: $(BITMAP)
+ 
+@@ -40,18 +40,15 @@ graphics/logo.png: graphics/graphics.svg
+       $(INKSCAPE) --actions="export-area:810:125:1220:342;export-width:380;export-height:180;export-filename:graphics/logo.png;export-do;" graphics/graphics.svg
+ 
+ install: all
+-      mkdir -p $(DESTDIR)$(gamesdir)
+-      cp monsterz $(DESTDIR)$(gamesdir)/
+-      chown root:games $(DESTDIR)$(gamesdir)/monsterz
+-      chmod g+s $(DESTDIR)$(gamesdir)/monsterz
+-      mkdir -p $(DESTDIR)$(pkgdatadir)/graphics
+-      mkdir -p $(DESTDIR)$(pkgdatadir)/sound
+-      cp monsterz.py $(DESTDIR)$(pkgdatadir)/
+-      cp $(BITMAP) $(DESTDIR)$(pkgdatadir)/graphics/
+-      cp $(SOUND) $(MUSIC) $(DESTDIR)$(pkgdatadir)/sound/
+-      mkdir -p $(DESTDIR)$(scoredir)
++      ${BSD_INSTALL_GAME_DIR} $(DESTDIR)$(gamesdir)
++      ${BSD_INSTALL_GAME} monsterz $(DESTDIR)$(gamesdir)/
++      ${BSD_INSTALL_GAME_DIR} $(DESTDIR)$(pkgdatadir)/graphics
++      ${BSD_INSTALL_GAME_DIR} $(DESTDIR)$(pkgdatadir)/sound
++      ${BSD_INSTALL_SCRIPT} monsterz.py $(DESTDIR)$(pkgdatadir)/
++      ${BSD_INSTALL_GAME_DATA} $(BITMAP) $(DESTDIR)$(pkgdatadir)/graphics/
++      ${BSD_INSTALL_GAME_DATA} $(SOUND) $(MUSIC) $(DESTDIR)$(pkgdatadir)/sound/
++      ${BSD_INSTALL_GAME_DIR} $(DESTDIR)$(scoredir)
++      ${BSD_INSTALL_GAME_DIR} $(DESTDIR)$(scoredir)
+       test -f $(DESTDIR)$(scorefile) || echo "" > $(DESTDIR)$(scorefile)
+-      chown root:games $(DESTDIR)$(scorefile)
+-      chmod g+w $(DESTDIR)$(scorefile)
+ 
+ uninstall: