CVS commit: pkgsrc/games/monsterz

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat May 17 14:28:55 UTC 2025

Modified Files:
        pkgsrc/games/monsterz: Makefile PLIST distinfo
        pkgsrc/games/monsterz/patches: patch-Makefile

Log Message:
monsterz: update to 0.9.

Changes:
* Merge Debian changes
* Add man page
* Add desktop file


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/games/monsterz/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/monsterz/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/games/monsterz/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/monsterz/patches/patch-Makefile

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.30 pkgsrc/games/monsterz/Makefile:1.31
--- pkgsrc/games/monsterz/Makefile:1.30 Sat Dec 14 17:11:08 2024
+++ pkgsrc/games/monsterz/Makefile      Sat May 17 14:28:55 2025
@@ -1,22 +1,22 @@
-# $NetBSD: Makefile,v 1.30 2024/12/14 17:11:08 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2025/05/17 14:28:55 wiz Exp $
 
-DISTNAME=              monsterz-0.8
+DISTNAME=              monsterz-0.9
 CATEGORIES=            games
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=0-wiz-0/}
-GITHUB_TAG=            v${PKGVERSION_NOREV}
+GITHUB_RELEASE=                v${PKGVERSION_NOREV}
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              https://github.com/0-wiz-0/monsterz
 COMMENT=               Puzzle game similar to the famous Bejeweled or Zookeeper
-# closest match
-LICENSE=               public-domain
+LICENSE=               public-domain AND gnu-gpl-v2 AND gnu-lgpl-v2.1
 
 DEPENDS+=              ${PYPKGPREFIX}-game-[0-9]*:../../devel/py-game
 
-REPLACE_PYTHON=                        monsterz.py
+REPLACE_PYTHON=                monsterz.py
 
 MAKE_FLAGS+=           prefix=${PREFIX}
 MAKE_FLAGS+=           gamesdir=${PREFIX}/bin
+MAKE_FLAGS+=           mandir=${PREFIX}/${PKGMANDIR}
 MAKE_FLAGS+=           scoredir=${VARBASE}/games
 MAKE_ENV+=             GAMEOWN=${GAMES_USER:Q}
 MAKE_ENV+=             GAMEGRP=${GAMES_GROUP:Q}

Index: pkgsrc/games/monsterz/PLIST
diff -u pkgsrc/games/monsterz/PLIST:1.2 pkgsrc/games/monsterz/PLIST:1.3
--- pkgsrc/games/monsterz/PLIST:1.2     Sun Jun 14 17:56:51 2009
+++ pkgsrc/games/monsterz/PLIST Sat May 17 14:28:55 2025
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:56:51 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2025/05/17 14:28:55 wiz Exp $
 bin/monsterz
+man/man6/monsterz.6
+share/applications/monsterz.desktop
 share/games/monsterz/graphics/background.png
 share/games/monsterz/graphics/bigtiles.png
 share/games/monsterz/graphics/board.png

Index: pkgsrc/games/monsterz/distinfo
diff -u pkgsrc/games/monsterz/distinfo:1.8 pkgsrc/games/monsterz/distinfo:1.9
--- pkgsrc/games/monsterz/distinfo:1.8  Sat Dec 14 17:11:08 2024
+++ pkgsrc/games/monsterz/distinfo      Sat May 17 14:28:55 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2024/12/14 17:11:08 wiz Exp $
+$NetBSD: distinfo,v 1.9 2025/05/17 14:28:55 wiz Exp $
 
-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
+BLAKE2s (monsterz-0.9.tar.gz) = 6e96277c6f6b021d811dc5759d98d584f682add02b0d5cac596be30735a64ddf
+SHA512 (monsterz-0.9.tar.gz) = b0193e1f3fff42804895b8bd3dbfcc10785906f88b1c92a698c8fc4efa343b9a26af49bf3987438a5de1bb264012c82d87d284b4e8b1ff30d9c758616122e9a7
+Size (monsterz-0.9.tar.gz) = 1885376 bytes
+SHA1 (patch-Makefile) = 0742058f210065a69ea4790fd38484114a6ba514

Index: pkgsrc/games/monsterz/patches/patch-Makefile
diff -u pkgsrc/games/monsterz/patches/patch-Makefile:1.1 pkgsrc/games/monsterz/patches/patch-Makefile:1.2
--- pkgsrc/games/monsterz/patches/patch-Makefile:1.1    Sat Dec 14 17:11:08 2024
+++ pkgsrc/games/monsterz/patches/patch-Makefile        Sat May 17 14:28:55 2025
@@ -1,44 +1,24 @@
-$NetBSD: patch-Makefile,v 1.1 2024/12/14 17:11:08 wiz Exp $
+$NetBSD: patch-Makefile,v 1.2 2025/05/17 14:28:55 wiz Exp $
 
-Honor CFLAGS and LDFLAGS.
-Use pkgsrc installation tools.
+Let pkgsrc handle special permissions.
 
---- Makefile.orig      2024-12-14 16:55:09.000000000 +0000
+--- Makefile.orig      2025-05-17 13:56:56.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)/
+@@ -53,8 +53,6 @@ install: all
+       $(INSTALL_DIR) $(DESTDIR)$(applicationsdir)
+       $(INSTALL_DIR) $(DESTDIR)$(mandir)/man6
+       $(INSTALL_PROGRAM) 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)
+       $(INSTALL_DIR) $(DESTDIR)$(pkgdatadir)/graphics
+       $(INSTALL_DIR) $(DESTDIR)$(pkgdatadir)/sound
+       $(INSTALL_SCRIPT) monsterz.py $(DESTDIR)$(pkgdatadir)/
+@@ -64,8 +62,6 @@ install: all
+       $(INSTALL_DATA) monsterz.6 $(DESTDIR)$(mandir)/man6
+       $(INSTALL_DIR) $(DESTDIR)$(scoredir)
        test -f $(DESTDIR)$(scorefile) || echo "" > $(DESTDIR)$(scorefile)
 -      chown root:games $(DESTDIR)$(scorefile)
 -      chmod g+w $(DESTDIR)$(scorefile)
  
  uninstall:
+       rm -f $(DESTDIR)$(gamesdir)/monsterz