Update games/stone-soup from 0.30.1 to 0.31.0 "The Alchemy of Forms". I
tried to simplify the Makefile patch a bit, and also installed the
included .desktop file, which was not being installed for some reason.
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/stone-soup/Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile
--- Makefile 12 Nov 2023 14:03:31 -0000 1.47
+++ Makefile 2 Mar 2024 22:30:23 -0000
@@ -2,7 +2,8 @@ BROKEN-hppa = ICE on dgn-shoals.cc:638
COMMENT = dungeon crawl stone soup
-VERSION = 0.30.1
+VERSION = 0.31.0
+TAGNAME = The Alchemy of Forms
DISTNAME= stone_soup-${VERSION}-nodeps
PKGNAME= stone-soup-${VERSION}
@@ -18,6 +19,7 @@ PERMIT_PACKAGE= Yes
WANTLIB += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB} c m sqlite3
+# Failover to github, devs are on and off about providing source on develz.org.
SITES = https://crawl.develz.org/release/${VERSION:R}/ \
https://github.com/crawl/crawl/releases/download/${VERSION}/
EXTRACT_SUFX= .tar.xz
@@ -41,13 +43,15 @@ MAKE_FLAGS = CC="${CC}" GCC="${GCC}" GX
INSTALL_UGRP=root:wheel \
prefix=${PREFIX} \
SAVEDIR="~/.crawl" \
- NO_YACC=1 V=1
+ NO_YACC=1 V=1 \
+ SRC_VERSION=${VERSION} RECENT_TAG="${TAGNAME}"
USE_GMAKE = Yes
CONFIGURE_STYLE = none
MODPY_RUN_DEPENDS = No
-MODPY_ADJ_FILES = util/species-gen.py
+MODPY_ADJ_FILES = util/species-gen.py \
+ util/tag-35-upgrade.py
FLAVORS = no_x11
FLAVOR ?=
@@ -62,7 +66,7 @@ CXXFLAGS += -DUSE_TILE
MAKE_FLAGS += TILES=y \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib \
- -lSDL2 -lSDL2_image -lpng -pthread"
+ -lSDL2 -lSDL2_image -lpng -pthread"
WANTLIB += GL GLU SDL2 SDL2_image freetype png pthread z
RUN_DEPENDS = devel/desktop-file-utils
LIB_DEPENDS += devel/sdl2 \
@@ -85,12 +89,11 @@ post-install:
${INSTALL_MAN} ${WRKDIST}/docs/crawl.6 ${PREFIX}/man/man6/crawl-ss.6
.if ! ${FLAVOR:Mno_x11}
${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps ${PREFIX}/share/applications
+ ${INSTALL_DATA} ${FILESDIR}/stone-soup.desktop \
+ ${PREFIX}/share/applications
${INSTALL_DATA} \
${PREFIX}/share/crawl/dat/tiles/stone_soup_icon-32x32.png \
${PREFIX}/share/pixmaps/stone-soup.png
- ${INSTALL_DATA} \
- ${WRKDIST}/source/xdg-data/org.develz.Crawl_tiles.desktop \
- ${PREFIX}/share/applications
.endif
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/stone-soup/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 12 Nov 2023 14:03:31 -0000 1.9
+++ distinfo 2 Mar 2024 22:30:23 -0000
@@ -1,2 +1,2 @@
-SHA256 (stone_soup-0.30.1-nodeps.tar.xz) =
kG03bvgAH7+fegUkUDD2T5MAxs44VdL43IHNjUjvCkY=
-SIZE (stone_soup-0.30.1-nodeps.tar.xz) = 18901720
+SHA256 (stone_soup-0.31.0-nodeps.tar.xz) =
FPIEAmlYt6U8CJizwsxp33Qx+qtbrDG3xVfOSSEJvgs=
+SIZE (stone_soup-0.31.0-nodeps.tar.xz) = 19577424
Index: patches/patch-source_Makefile
===================================================================
RCS file: /cvs/ports/games/stone-soup/patches/patch-source_Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 patch-source_Makefile
--- patches/patch-source_Makefile 12 Nov 2023 14:03:31 -0000 1.9
+++ patches/patch-source_Makefile 2 Mar 2024 22:30:23 -0000
@@ -1,29 +1,7 @@
Index: source/Makefile
--- source/Makefile.orig
+++ source/Makefile
-@@ -262,9 +262,6 @@ ifdef msys
- BUILD_LIBPNG = YesPlease
- COPY_FONTS = yes
- endif
-- ifeq ($(shell gcc -v -static -static-libstdc++ 2>&1 | grep
'unrecognized option'),)
-- EXTRA_LIBS += -static -static-libgcc -static-libstdc++
-- endif
- endif
- ifeq ($(uname_S),Darwin)
- ifdef MAC_TARGET
-@@ -374,11 +371,8 @@ endif
- #
- ifndef NO_APPLE_PLATFORM
- ifeq ($(uname_S),Darwin)
--ifneq ($(shell gcc -v 2>&1 | grep Apple),)
--APPLE_PLATFORM = YesPlease
- endif
- endif
--endif
-
-
- ifdef WIN32
-@@ -509,15 +503,7 @@ ifneq ($(GCC_VER),)
+@@ -509,15 +509,7 @@ ifneq ($(GCC_VER),)
GCC_VER_SUFFIX:=-$(GCC_VER)
endif
@@ -39,7 +17,7 @@ Index: source/Makefile
ifneq ($(FORCE_CC),)
GCC := $(FORCE_CC)
-@@ -1177,62 +1163,13 @@ OBJECTS += $(TILEDEFOBJS)
+@@ -1177,14 +1169,10 @@ OBJECTS += $(TILEDEFOBJS)
ifdef TILES_ANY
ifndef NO_OPTIMIZE
@@ -54,68 +32,22 @@ Index: source/Makefile
endif
endif
--ifdef BUILD_PCRE
--CONTRIBS += pcre
--CONTRIB_LIBS += $(LIBPCRE)
--endif
--ifdef BUILD_FREETYPE
--CONTRIBS += freetype
--CONTRIB_LIBS += $(LIBFREETYPE)
--endif
--ifdef BUILD_LIBPNG
--CONTRIBS += libpng
--CONTRIB_LIBS := $(LIBPNG) $(CONTRIB_LIBS)
--endif
--ifdef BUILD_SDL2
--CONTRIBS += sdl2
--CONTRIB_LIBS := $(LIBSDL2) $(CONTRIB_LIBS)
--ifeq ($(uname_S),Linux)
--LIBS += -ldl -lrt
--endif
--endif
--ifdef BUILD_SDL2IMAGE
--CONTRIBS += sdl2-image
--CONTRIB_LIBS := $(LIBSDL2IMAGE) $(CONTRIB_LIBS)
--endif
--ifdef BUILD_SDL2MIXER
--CONTRIBS += sdl2-mixer
--CONTRIB_LIBS := $(LIBSDL2MIXER) $(CONTRIB_LIBS)
--endif
--ifdef BUILD_ZLIB
--CONTRIBS += zlib
--CONTRIB_LIBS += $(LIBZ)
--endif
--ifdef BUILD_LUA
--ifdef USE_LUAJIT
--CONTRIBS += luajit/src
--CFOTHER_L += -DUSE_LUAJIT
--else
--CONTRIBS += lua/src
--endif
--CONTRIB_LIBS += $(LIBLUA)
--endif
--ifdef BUILD_SQLITE
--CONTRIBS += sqlite
--CONTRIB_LIBS += $(LIBSQLITE)
--endif
--
- EXTRA_OBJECTS += version.o
+@@ -1280,9 +1268,7 @@ GENERATED_FILES := $(GENERATED_HEADERS) art-data.h mi-
- ifdef CONTRIBS
-@@ -1282,7 +1219,6 @@ LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/d
+ LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/descript/??)))
SRC_PKG_BASE := stone_soup
- SRC_VERSION := $(shell git describe $(MERGE_BASE) 2>/dev/null || cat
util/release_ver)
+-SRC_VERSION := $(shell git describe $(MERGE_BASE) 2>/dev/null || cat
util/release_ver)
MAJOR_VERSION = $(shell echo "$(SRC_VERSION)"|$(SED) -r
's/-.*//;s/^([^.]+\.[^.]+).*/\1/')
-RECENT_TAG := $(shell git describe --abbrev=0 $(MERGE_BASE))
WINARCH := $(shell $(GXX) -dumpmachine | grep -q x64_64 && echo win64 || echo
win32)
export SRC_VERSION
-@@ -2090,8 +2026,6 @@ mac-app-console: all
- #############################################################################
+@@ -2092,7 +2078,7 @@ mac-app-console: all
# Building the Android package
#
--
+
-NPROC := $(shell nproc)
++
android-project/app/build.gradle: android-project/app/build.gradle.in
sed -e "s/@ANDROID_VERSION@/${ANDROID}/" -e
"s/@CRAWL_VERSION@/${SRC_VERSION}/" -e "s/@NPROC@/${NPROC}/"
<android-project/app/build.gradle.in >android-project/app/build.gradle
Index: patches/patch-source_debian_crawl-tiles_desktop
===================================================================
RCS file: patches/patch-source_debian_crawl-tiles_desktop
diff -N patches/patch-source_debian_crawl-tiles_desktop
--- patches/patch-source_debian_crawl-tiles_desktop 12 Nov 2023 14:03:31
-0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- source/debian/crawl-tiles.desktop.orig Thu Sep 29 01:29:00 2016
-+++ source/debian/crawl-tiles.desktop Thu Sep 29 01:38:51 2016
-@@ -2,6 +2,6 @@
- Type=Application
-
- Name=Dungeon Crawl (tiles)
--Exec=/usr/games/crawl-tiles
--Icon=crawl
-+Exec=/usr/local/bin/crawl-ss
-+Icon=stone-soup
- Categories=Game;AdventureGame;
Index: pkg/PFRAG.no-no_x11
===================================================================
RCS file: /cvs/ports/games/stone-soup/pkg/PFRAG.no-no_x11,v
retrieving revision 1.12
diff -u -p -r1.12 PFRAG.no-no_x11
--- pkg/PFRAG.no-no_x11 12 Nov 2023 14:03:31 -0000 1.12
+++ pkg/PFRAG.no-no_x11 2 Mar 2024 22:30:23 -0000
@@ -1,10 +1,11 @@
-share/applications/org.develz.Crawl_tiles.desktop
+share/applications/stone-soup.desktop
share/crawl/dat/tiles/
share/crawl/dat/tiles/feat.png
share/crawl/dat/tiles/floor.png
share/crawl/dat/tiles/gui.png
share/crawl/dat/tiles/icons.png
share/crawl/dat/tiles/logo.png
+share/crawl/dat/tiles/logo_cropped.png
share/crawl/dat/tiles/logosmall.png
share/crawl/dat/tiles/main.png
share/crawl/dat/tiles/player.png
@@ -36,6 +37,7 @@ share/crawl/dat/tiles/title_froggy_thund
share/crawl/dat/tiles/title_gompami_kohu_xbow.png
share/crawl/dat/tiles/title_kaonedong_ignis_the_dying_flame.png
share/crawl/dat/tiles/title_kaonedong_menkaure_prince_of_dust.png
+share/crawl/dat/tiles/title_king7artist_eustachio.png
share/crawl/dat/tiles/title_micah_c_ereshkigal.png
share/crawl/dat/tiles/title_nibiki_octopode.png
share/crawl/dat/tiles/title_omndra_zot_demon.png
@@ -50,6 +52,7 @@ share/crawl/dat/tiles/title_shadyamish_o
share/crawl/dat/tiles/title_white_noise_entering_the_dungeon.png
share/crawl/dat/tiles/title_white_noise_grabbing_the_orb.png
share/crawl/dat/tiles/wall.png
+share/crawl/docs/tiles_help.txt
share/pixmaps/
share/pixmaps/stone-soup.png
@tag update-desktop-database
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/stone-soup/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- pkg/PLIST 12 Nov 2023 14:03:31 -0000 1.11
+++ pkg/PLIST 2 Mar 2024 22:30:23 -0000
@@ -35,9 +35,14 @@ share/crawl/dat/database/shout.txt
share/crawl/dat/database/wpnnoise.txt
share/crawl/dat/database/zh/
share/crawl/dat/database/zh/FAQ.txt
+share/crawl/dat/database/zh/godname.txt
+share/crawl/dat/database/zh/godspeak.txt
share/crawl/dat/database/zh/help.txt
+share/crawl/dat/database/zh/miscname.txt
share/crawl/dat/database/zh/monflee.txt
+share/crawl/dat/database/zh/monspell.txt
share/crawl/dat/database/zh/montitle.txt
+share/crawl/dat/database/zh/shout.txt
share/crawl/dat/defaults/
share/crawl/dat/defaults/autopickup_exceptions.txt
share/crawl/dat/defaults/glyph_colours.txt
@@ -105,6 +110,7 @@ share/crawl/dat/des/branches/zot.des
share/crawl/dat/des/builder/
share/crawl/dat/des/builder/alphashops.des
share/crawl/dat/des/builder/arena.des
+share/crawl/dat/des/builder/custombooks.des
share/crawl/dat/des/builder/decor.des
share/crawl/dat/des/builder/dummy.des
share/crawl/dat/des/builder/layout.des
@@ -151,6 +157,7 @@ share/crawl/dat/des/serial/forest.des
share/crawl/dat/des/serial/glass.des
share/crawl/dat/des/serial/gnoll_camp.des
share/crawl/dat/des/serial/ice.des
+share/crawl/dat/des/serial/library.des
share/crawl/dat/des/serial/magic_research.des
share/crawl/dat/des/serial/park.des
share/crawl/dat/des/serial/rivers.des
@@ -572,10 +579,10 @@ share/crawl/dat/dlua/lm_fog.lua
share/crawl/dat/dlua/lm_items.lua
share/crawl/dat/dlua/lm_mon_prop.lua
share/crawl/dat/dlua/lm_monst.lua
-share/crawl/dat/dlua/lm_mslav.lua
share/crawl/dat/dlua/lm_named_hatch.lua
share/crawl/dat/dlua/lm_pdesc.lua
share/crawl/dat/dlua/lm_props.lua
+share/crawl/dat/dlua/lm_replica.lua
share/crawl/dat/dlua/lm_timed.lua
share/crawl/dat/dlua/lm_tmsg.lua
share/crawl/dat/dlua/lm_toll.lua
@@ -612,11 +619,11 @@ share/crawl/docs/arena.txt
@comment share/crawl/docs/changelog.txt
share/crawl/docs/crawl_manual.txt
@comment share/crawl/docs/develop/coding_conventions.txt
+@comment share/crawl/docs/develop/background_creation.txt
@comment share/crawl/docs/develop/
@comment share/crawl/docs/develop/IRC.txt
@comment share/crawl/docs/develop/android.txt
@comment share/crawl/docs/develop/arena.txt
-@comment share/crawl/docs/develop/background_creation.txt
@comment share/crawl/docs/develop/ctags.txt
@comment share/crawl/docs/develop/editor_tips.txt
@comment share/crawl/docs/develop/gdb_tips.txt
@@ -650,20 +657,7 @@ share/crawl/docs/options_guide.txt
share/crawl/docs/quickstart.md
share/crawl/docs/quickstart.txt
@comment share/crawl/docs/ssh_guide.txt
-share/crawl/docs/tiles_help.txt
share/crawl/settings/
-share/crawl/settings/0.12_monster_glyphs.txt
-share/crawl/settings/0.13_monster_glyphs.txt
-share/crawl/settings/0.14_monster_glyphs.txt
-share/crawl/settings/0.16_monster_glyphs.txt
-share/crawl/settings/0.17_monster_glyphs.txt
-share/crawl/settings/0.18_monster_glyphs.txt
-share/crawl/settings/0.9_monster_glyphs.txt
-share/crawl/settings/034_command_keys.txt
-share/crawl/settings/052_monster_glyphs.txt
-share/crawl/settings/060_monster_glyphs.txt
-share/crawl/settings/071_monster_glyphs.txt
-share/crawl/settings/080_monster_glyphs.txt
share/crawl/settings/advanced_optioneering.txt
share/crawl/settings/colemak_command_keys.txt
share/crawl/settings/dec_glyphs.txt
