CVS commit: pkgsrc/games

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Dec 15 12:25:31 UTC 2022

Modified Files:
        pkgsrc/games/stone-soup: Makefile Makefile.common PLIST distinfo
        pkgsrc/games/stone-soup-sdl: Makefile PLIST

Log Message:
stone-soup[-sdl]: update to 0.29.1

Release notes for 0.29:

https://crawl.develz.org/wordpress/0-29-shooting-stars


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/games/stone-soup/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/games/stone-soup/Makefile.common
cvs rdiff -u -r1.6 -r1.7 pkgsrc/games/stone-soup/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/games/stone-soup/distinfo
cvs rdiff -u -r1.28 -r1.29 pkgsrc/games/stone-soup-sdl/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/games/stone-soup-sdl/PLIST

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

Modified files:

Index: pkgsrc/games/stone-soup/Makefile
diff -u pkgsrc/games/stone-soup/Makefile:1.20 pkgsrc/games/stone-soup/Makefile:1.21
--- pkgsrc/games/stone-soup/Makefile:1.20       Wed Nov 23 16:20:09 2022
+++ pkgsrc/games/stone-soup/Makefile    Thu Dec 15 12:25:31 2022
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.20 2022/11/23 16:20:09 adam Exp $
+# $NetBSD: Makefile,v 1.21 2022/12/15 12:25:31 nia Exp $
 
-PKGREVISION= 3
 .include "Makefile.common"
 
 MAINTAINER=    nia%NetBSD.org@localhost

Index: pkgsrc/games/stone-soup/Makefile.common
diff -u pkgsrc/games/stone-soup/Makefile.common:1.10 pkgsrc/games/stone-soup/Makefile.common:1.11
--- pkgsrc/games/stone-soup/Makefile.common:1.10        Wed Mar  2 21:31:07 2022
+++ pkgsrc/games/stone-soup/Makefile.common     Thu Dec 15 12:25:31 2022
@@ -1,14 +1,11 @@
-# $NetBSD: Makefile.common,v 1.10 2022/03/02 21:31:07 nia Exp $
+# $NetBSD: Makefile.common,v 1.11 2022/12/15 12:25:31 nia Exp $
 # used by games/stone-soup/Makefile
 # used by games/stone-soup-sdl/Makefile
 
-DISTNAME=      stone_soup-0.28.0-nodeps
-PKGNAME=       ${DISTNAME:S/_/-/:S/-nodeps//1}
+DISTNAME=      stone-soup-0.29.1
 CATEGORIES=    games
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=crawl/}
 GITHUB_PROJECT=        crawl
-GITHUB_RELEASE=        ${PKGVERSION_NOREV}
-EXTRACT_SUFX=  .tar.xz
 
 HOMEPAGE=      https://crawl.develz.org/
 LICENSE=       gnu-gpl-v2
@@ -16,7 +13,7 @@ LICENSE=      gnu-gpl-v2
 DISTINFO_FILE= ${.CURDIR}/../../games/stone-soup/distinfo
 PATCHDIR=      ${.CURDIR}/../../games/stone-soup/patches
 
-WRKSRC=                ${WRKDIR}/stone_soup-${PKGVERSION_NOREV}
+WRKSRC=                ${WRKDIR}/crawl-${PKGVERSION_NOREV}/crawl-ref
 BUILD_DIRS=    source
 USE_TOOLS+=    pkg-config gmake perl
 USE_LANGUAGES= c c++
@@ -56,6 +53,9 @@ CHECK_PORTABILITY_SKIP+=      source/contrib/
 CHECK_PORTABILITY_SKIP+=       source/contrib/sdl2-image/external/tiff-4.0.3/configure
 CHECK_PORTABILITY_SKIP+=       */Xcode/*.sh
 
+pre-build:
+       ${ECHO} ${PKGVERSION_NOREV} > ${WRKSRC}/source/util/release_ver
+
 .include "../../databases/sqlite3/buildlink3.mk"
 # FIXME: Compatibility issue with NetBSD curses
 # https://github.com/crawl/crawl/issues/1661

Index: pkgsrc/games/stone-soup/PLIST
diff -u pkgsrc/games/stone-soup/PLIST:1.6 pkgsrc/games/stone-soup/PLIST:1.7
--- pkgsrc/games/stone-soup/PLIST:1.6   Wed Mar  2 21:31:07 2022
+++ pkgsrc/games/stone-soup/PLIST       Thu Dec 15 12:25:31 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2022/03/02 21:31:07 nia Exp $
+@comment $NetBSD: PLIST,v 1.7 2022/12/15 12:25:31 nia Exp $
 bin/crawl
 share/stone-soup/dat/clua/autofight.lua
 share/stone-soup/dat/clua/automagic.lua
@@ -127,6 +127,7 @@ share/stone-soup/dat/des/serial/bayou.de
 share/stone-soup/dat/des/serial/column_ruins.des
 share/stone-soup/dat/des/serial/corridors.des
 share/stone-soup/dat/des/serial/curves.des
+share/stone-soup/dat/des/serial/demonic.des
 share/stone-soup/dat/des/serial/forest.des
 share/stone-soup/dat/des/serial/glass.des
 share/stone-soup/dat/des/serial/gnoll_camp.des

Index: pkgsrc/games/stone-soup/distinfo
diff -u pkgsrc/games/stone-soup/distinfo:1.9 pkgsrc/games/stone-soup/distinfo:1.10
--- pkgsrc/games/stone-soup/distinfo:1.9        Wed Mar  2 21:31:07 2022
+++ pkgsrc/games/stone-soup/distinfo    Thu Dec 15 12:25:31 2022
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.9 2022/03/02 21:31:07 nia Exp $
+$NetBSD: distinfo,v 1.10 2022/12/15 12:25:31 nia Exp $
 
-BLAKE2s (stone_soup-0.28.0-nodeps.tar.xz) = e61ae2972502808190cc3f4a97c0283cb161615bb59a55eca39613eeb199de5d
-SHA512 (stone_soup-0.28.0-nodeps.tar.xz) = 84ab9893c87c1af213dfe6fdf0e0d2249b72f7e3deb557cfd80f79f7f77d03ef919d4dfee5a36a159937fc60dcad11d383239e82798017e10e0ff7c3430ad98a
-Size (stone_soup-0.28.0-nodeps.tar.xz) = 13913072 bytes
+BLAKE2s (stone-soup-0.29.1.tar.gz) = 4c2681c123f08cb4b31e08b92f52661fdb1baf3b45d4891321454fae34bbba37
+SHA512 (stone-soup-0.29.1.tar.gz) = 2ca49c4cd228526d47e4ad7e9556b6c26566595458423cd8e6b762298f229eb7ba273770ae1e12939ba66574a5b55e44812d06c4809d4327ed9bfd738501af04
+Size (stone-soup-0.29.1.tar.gz) = 17510846 bytes
+SHA1 (patch-source_util_gen__ver.pl) = 9f97d5ef511ef5c59d87977025c2280f4ccf1838

Index: pkgsrc/games/stone-soup-sdl/Makefile
diff -u pkgsrc/games/stone-soup-sdl/Makefile:1.28 pkgsrc/games/stone-soup-sdl/Makefile:1.29
--- pkgsrc/games/stone-soup-sdl/Makefile:1.28   Wed Nov 23 16:20:10 2022
+++ pkgsrc/games/stone-soup-sdl/Makefile        Thu Dec 15 12:25:31 2022
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.28 2022/11/23 16:20:10 adam Exp $
+# $NetBSD: Makefile,v 1.29 2022/12/15 12:25:31 nia Exp $
 
-PKGREVISION= 5
 .include "../../games/stone-soup/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/_/-/:S/-soup/-soup-sdl/:S/-nodeps//1}
@@ -21,13 +20,19 @@ MAKE_FLAGS+=        PROPORTIONAL_FONT=${PREFIX}
 MAKE_FLAGS+=   MONOSPACED_FONT=${PREFIX}/share/fonts/X11/TTF/DejaVuSansMono.ttf
 
 INSTALLATION_DIRS+=    share/applications
+INSTALLATION_DIRS+=    share/icons/hicolor/32x32/apps
 INSTALLATION_DIRS+=    share/icons/hicolor/48x48/apps
+INSTALLATION_DIRS+=    share/icons/hicolor/512x512/apps
 
 post-install:
        ${INSTALL_DATA} ${FILESDIR}/crawl.desktop \
            ${DESTDIR}${PREFIX}/share/applications
-       ${INSTALL_DATA} ${WRKSRC}/source/debian/crawl.png \
-           ${DESTDIR}${PREFIX}/share/icons/hicolor/48x48/apps
+       ${INSTALL_DATA} ${WRKSRC}/source/dat/tiles/stone_soup_icon-32x32.png \
+           ${DESTDIR}${PREFIX}/share/icons/hicolor/32x32/apps/crawl.png
+       ${INSTALL_DATA} ${WRKSRC}/source/dat/tiles/stone_soup_icon-48x48.png \
+           ${DESTDIR}${PREFIX}/share/icons/hicolor/48x48/apps/crawl.png
+       ${INSTALL_DATA} ${WRKSRC}/source/dat/tiles/stone_soup_icon-512x512.png \
+           ${DESTDIR}${PREFIX}/share/icons/hicolor/512x512/apps/crawl.png
 
 .include "../../audio/SDL2_mixer/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"

Index: pkgsrc/games/stone-soup-sdl/PLIST
diff -u pkgsrc/games/stone-soup-sdl/PLIST:1.6 pkgsrc/games/stone-soup-sdl/PLIST:1.7
--- pkgsrc/games/stone-soup-sdl/PLIST:1.6       Wed Mar  2 21:31:07 2022
+++ pkgsrc/games/stone-soup-sdl/PLIST   Thu Dec 15 12:25:31 2022
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.6 2022/03/02 21:31:07 nia Exp $
+@comment $NetBSD: PLIST,v 1.7 2022/12/15 12:25:31 nia Exp $
 bin/crawl
 share/applications/crawl.desktop
+share/icons/hicolor/32x32/apps/crawl.png
 share/icons/hicolor/48x48/apps/crawl.png
+share/icons/hicolor/512x512/apps/crawl.png
 share/stone-soup/dat/clua/autofight.lua
 share/stone-soup/dat/clua/automagic.lua
 share/stone-soup/dat/clua/delays.lua
@@ -129,6 +131,7 @@ share/stone-soup/dat/des/serial/bayou.de
 share/stone-soup/dat/des/serial/column_ruins.des
 share/stone-soup/dat/des/serial/corridors.des
 share/stone-soup/dat/des/serial/curves.des
+share/stone-soup/dat/des/serial/demonic.des
 share/stone-soup/dat/des/serial/forest.des
 share/stone-soup/dat/des/serial/glass.des
 share/stone-soup/dat/des/serial/gnoll_camp.des
@@ -591,6 +594,7 @@ share/stone-soup/dat/tiles/title_kaonedo
 share/stone-soup/dat/tiles/title_nibiki_octopode.png
 share/stone-soup/dat/tiles/title_omndra_zot_demon.png
 share/stone-soup/dat/tiles/title_peileppe_bloax_eye.png
+share/stone-soup/dat/tiles/title_philosopheropposite_palentonga_paladin.png
 share/stone-soup/dat/tiles/title_ploomutoo_ijyb.png
 share/stone-soup/dat/tiles/title_pooryurik_knight.png
 share/stone-soup/dat/tiles/title_psiweapon_kiku.png